diff --git a/.gitignore b/.gitignore
index 9ba33dc..e5ca201 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /config_*.xml
 /translations/*.php
 /vendor
+/.php_cs.cache
\ No newline at end of file
diff --git a/controllers/front/index.php b/controllers/front/index.php
index b3b3924..b7d9ae0 100644
--- a/controllers/front/index.php
+++ b/controllers/front/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/controllers/front/subscription.php b/controllers/front/subscription.php
index 7b74c6c..f92ea06 100644
--- a/controllers/front/subscription.php
+++ b/controllers/front/subscription.php
@@ -26,6 +26,8 @@
 
 /**
  * @since 1.5.0
+ *
+ * @property Ps_Emailsubscription $module
  */
 class Ps_EmailsubscriptionSubscriptionModuleFrontController extends ModuleFrontController
 {
diff --git a/controllers/front/verification.php b/controllers/front/verification.php
index 7d3fed4..ed9a5d2 100644
--- a/controllers/front/verification.php
+++ b/controllers/front/verification.php
@@ -26,6 +26,8 @@
 
 /**
  * @since 1.5.0
+ *
+ * @property Ps_Emailsubscription $module
  */
 class Ps_EmailsubscriptionVerificationModuleFrontController extends ModuleFrontController
 {
diff --git a/controllers/index.php b/controllers/index.php
index b3b3924..b7d9ae0 100644
--- a/controllers/index.php
+++ b/controllers/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/index.php b/index.php
index b3b3924..b7d9ae0 100644
--- a/index.php
+++ b/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/mails/en/index.php b/mails/en/index.php
index b3b3924..b7d9ae0 100644
--- a/mails/en/index.php
+++ b/mails/en/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/mails/index.php b/mails/index.php
index b3b3924..b7d9ae0 100644
--- a/mails/index.php
+++ b/mails/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/ps_emailsubscription.php b/ps_emailsubscription.php
index 0185291..fd3900d 100644
--- a/ps_emailsubscription.php
+++ b/ps_emailsubscription.php
@@ -23,7 +23,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }
@@ -51,49 +50,81 @@ class Ps_Emailsubscription extends Module implements WidgetInterface
     const TPL_DEFAULT = 'ps_emailsubscription.tpl';
 
     /**
-     * @param EntityManager $entity_manager
+     * @var bool|string
+     */
+    public $error;
+    /**
+     * @var bool|string
+     */
+    public $valid;
+    /**
+     * @var array<string, array<int, string>>
+     */
+    public $_files;
+    /**
+     * @var string|null
+     */
+    public $_searched_email;
+    /**
+     * @var string
+     */
+    public $_html;
+    /**
+     * @var string
+     */
+    public $file;
+    /**
+     * @var array
      */
-    public function __construct(EntityManager $entity_manager)
+    public $post_errors;
+    /**
+     * @var array
+     */
+    public $post_valid;
+    /**
+     * @var HelperList
+     */
+    public $_helperlist;
+
+    public function __construct()
     {
         $this->name = 'ps_emailsubscription';
         $this->need_instance = 0;
 
-        $this->controllers = array('verification', 'subscription');
+        $this->controllers = ['verification', 'subscription'];
 
         $this->bootstrap = true;
         parent::__construct();
 
-        $this->displayName = $this->trans('Newsletter subscription', array(), 'Modules.Emailsubscription.Admin');
-        $this->description = $this->trans('Keep in touch with your customers the way you want, add a form to the homepage of your store and allow all the curious to subscribe to your newsletter.', array(), 'Modules.Emailsubscription.Admin');
-        $this->confirmUninstall = $this->trans('Are you sure that you want to delete all of your contacts?', array(), 'Modules.Emailsubscription.Admin');
-        $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_);
-
-        $this->entity_manager = $entity_manager;
+        $this->displayName = $this->trans('Newsletter subscription', [], 'Modules.Emailsubscription.Admin');
+        $this->description = $this->trans('Keep in touch with your customers the way you want, add a form to the homepage of your store and allow all the curious to subscribe to your newsletter.', [], 'Modules.Emailsubscription.Admin');
+        $this->confirmUninstall = $this->trans('Are you sure that you want to delete all of your contacts?', [], 'Modules.Emailsubscription.Admin');
+        $this->ps_versions_compliancy = ['min' => '1.7.1.0', 'max' => _PS_VERSION_];
 
         $this->version = '2.6.1';
         $this->author = 'PrestaShop';
         $this->error = false;
         $this->valid = false;
-        $this->_files = array(
-            'name' => array('newsletter_conf', 'newsletter_voucher'),
-            'ext' => array(
+        $this->_files = [
+            'name' => ['newsletter_conf', 'newsletter_voucher'],
+            'ext' => [
                 0 => 'html',
                 1 => 'txt',
-            ),
-        );
+            ],
+        ];
 
         $this->_searched_email = null;
 
         $this->_html = '';
         if ($this->id) {
             $this->file = 'export_' . Configuration::get('PS_NEWSLETTER_RAND') . '.csv';
-            $this->post_valid = array();
+            $this->post_valid = [];
 
             // Getting data...
             $countries = Country::getCountries($this->context->language->id);
 
             // ...formatting array
-            $countries_list = array($this->trans('All countries', array(), 'Admin.Global'));
+            $countries_list = [$this->trans('All countries', [], 'Admin.Global')];
             foreach ($countries as $country) {
                 $countries_list[$country['id_country']] = $country['name'];
             }
@@ -104,7 +135,7 @@ public function install()
     {
         if (!parent::install()
             || !$this->registerHook(
-                array(
+                [
                     'actionFrontControllerSetMedia',
                     'displayFooterBefore',
                     'actionCustomerAccountAdd',
@@ -115,7 +146,7 @@ public function install()
                     'actionDeleteGDPRCustomer',
                     'actionExportGDPRData',
                     'actionCustomerAccountUpdate',
-                )
+                ]
             )
         ) {
             return false;
@@ -130,7 +161,7 @@ public function install()
         }
 
         // New data
-        $conditions = array();
+        $conditions = [];
         $languages = Language::getLanguages(false);
         foreach ($languages as $lang) {
             $conditions[(int) $lang['id_lang']] = $this->getConditionFixtures($lang);
@@ -189,7 +220,7 @@ public function getContent()
             Configuration::updateValue('NW_CONFIRMATION_EMAIL', (bool) Tools::getValue('NW_CONFIRMATION_EMAIL'));
             Configuration::updateValue('NW_VERIFICATION_EMAIL', (bool) Tools::getValue('NW_VERIFICATION_EMAIL'));
 
-            $conditions = array();
+            $conditions = [];
             $languages = Language::getLanguages(false);
             foreach ($languages as $lang) {
                 if (Tools::getIsset('NW_CONDITIONS_' . $lang['id_lang'])) {
@@ -201,12 +232,11 @@ public function getContent()
             $voucher = Tools::getValue('NW_VOUCHER_CODE');
 
             if ($voucher && !Validate::isDiscountName($voucher)) {
-                $this->_html .= $this->displayError($this->trans('The voucher code is invalid.', array(), 'Admin.Notifications.Error'));
+                $this->_html .= $this->displayError($this->trans('The voucher code is invalid.', [], 'Admin.Notifications.Error'));
             } else {
                 Configuration::updateValue('NW_VOUCHER_CODE', pSQL($voucher));
-                $this->_html .= $this->displayConfirmation($this->trans('Settings updated', array(), 'Admin.Notifications.Success'));
+                $this->_html .= $this->displayConfirmation($this->trans('Settings updated', [], 'Admin.Notifications.Success'));
             }
-
         } elseif (Tools::isSubmit('subscribedmerged')) {
             $id = Tools::getValue('id');
 
@@ -216,12 +246,11 @@ public function getContent()
                 Db::getInstance()->execute($sql);
             } else {
                 $c = new Customer((int) $id);
-                $c->newsletter = (int) !$c->newsletter;
+                $c->newsletter = (bool) !$c->newsletter;
                 $c->update();
             }
 
             Tools::redirectAdmin($this->context->link->getAdminLink('AdminModules', false) . '&configure=' . $this->name . '&conf=4&token=' . Tools::getAdminTokenLite('AdminModules'));
-
         } elseif (Tools::isSubmit('submitExport') && $action = Tools::getValue('action')) {
             $this->export_csv();
         } elseif (Tools::isSubmit('searchEmail')) {
@@ -239,47 +268,47 @@ public function getContent()
 
     public function renderList()
     {
-        $fields_list = array(
-            'id' => array(
-                'title' => $this->trans('ID', array(), 'Admin.Global'),
+        $fields_list = [
+            'id' => [
+                'title' => $this->trans('ID', [], 'Admin.Global'),
                 'search' => false,
-            ),
-            'shop_name' => array(
-                'title' => $this->trans('Shop', array(), 'Admin.Global'),
+            ],
+            'shop_name' => [
+                'title' => $this->trans('Shop', [], 'Admin.Global'),
                 'search' => false,
-            ),
-            'gender' => array(
-                'title' => $this->trans('Gender', array(), 'Admin.Global'),
+            ],
+            'gender' => [
+                'title' => $this->trans('Gender', [], 'Admin.Global'),
                 'search' => false,
-            ),
-            'lastname' => array(
-                'title' => $this->trans('Lastname', array(), 'Admin.Global'),
+            ],
+            'lastname' => [
+                'title' => $this->trans('Lastname', [], 'Admin.Global'),
                 'search' => false,
-            ),
-            'firstname' => array(
-                'title' => $this->trans('Firstname', array(), 'Admin.Global'),
+            ],
+            'firstname' => [
+                'title' => $this->trans('Firstname', [], 'Admin.Global'),
                 'search' => false,
-            ),
-            'email' => array(
-                'title' => $this->trans('Email', array(), 'Admin.Global'),
+            ],
+            'email' => [
+                'title' => $this->trans('Email', [], 'Admin.Global'),
                 'search' => false,
-            ),
-            'subscribed' => array(
-                'title' => $this->trans('Subscribed', array(), 'Modules.Emailsubscription.Admin'),
+            ],
+            'subscribed' => [
+                'title' => $this->trans('Subscribed', [], 'Modules.Emailsubscription.Admin'),
                 'type' => 'bool',
                 'active' => 'subscribed',
                 'search' => false,
-            ),
-            'iso_code' => array(
-                'title' => $this->trans('Iso language', array(), 'Modules.Emailsubscription.Admin'),
+            ],
+            'iso_code' => [
+                'title' => $this->trans('Iso language', [], 'Modules.Emailsubscription.Admin'),
                 'search' => false,
-            ),
-            'newsletter_date_add' => array(
-                'title' => $this->trans('Subscribed on', array(), 'Modules.Emailsubscription.Admin'),
+            ],
+            'newsletter_date_add' => [
+                'title' => $this->trans('Subscribed on', [], 'Modules.Emailsubscription.Admin'),
                 'type' => 'date',
                 'search' => false,
-            ),
-        );
+            ],
+        ];
 
         if (!Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE')) {
             unset($fields_list['shop_name']);
@@ -287,7 +316,7 @@ public function renderList()
 
         $helper_list = new HelperList();
         $helper_list->module = $this;
-        $helper_list->title = $this->trans('Newsletter registrations', array(), 'Modules.Emailsubscription.Admin');
+        $helper_list->title = $this->trans('Newsletter registrations', [], 'Modules.Emailsubscription.Admin');
         $helper_list->shopLinkType = '';
         $helper_list->no_link = true;
         $helper_list->show_toolbar = true;
@@ -296,7 +325,7 @@ public function renderList()
         $helper_list->table = 'merged';
         $helper_list->currentIndex = $this->context->link->getAdminLink('AdminModules', false) . '&configure=' . $this->name;
         $helper_list->token = Tools::getAdminTokenLite('AdminModules');
-        $helper_list->actions = array('viewCustomer');
+        $helper_list->actions = ['viewCustomer'];
 
         // This is needed for displayEnableLink to avoid code duplication
         $this->_helperlist = $helper_list;
@@ -315,32 +344,32 @@ public function renderList()
 
     public function displayViewCustomerLink($token = null, $id, $name = null)
     {
-        $this->smarty->assign(array(
+        $this->smarty->assign([
             'href' => 'index.php?controller=AdminCustomers&id_customer=' . (int) $id . '&updatecustomer&token=' . Tools::getAdminTokenLite('AdminCustomers'),
-            'action' => $this->trans('View', array(), 'Admin.Actions'),
+            'action' => $this->trans('View', [], 'Admin.Actions'),
             'disable' => !((int) $id > 0),
-        ));
+        ]);
 
         return $this->display(__FILE__, 'views/templates/admin/list_action_viewcustomer.tpl');
     }
 
     public function displayEnableLink($token, $id, $value, $active, $id_category = null, $id_product = null, $ajax = false)
     {
-        $this->smarty->assign(array(
+        $this->smarty->assign([
             'ajax' => $ajax,
             'enabled' => (bool) $value,
             'url_enable' => $this->_helperlist->currentIndex . '&' . $this->_helperlist->identifier . '=' . $id . '&' . $active . $this->_helperlist->table . ($ajax ? '&action=' . $active . $this->_helperlist->table . '&ajax=' . (int) $ajax : '') . ((int) $id_category && (int) $id_product ? '&id_category=' . (int) $id_category : '') . '&token=' . $token,
-        ));
+        ]);
 
         return $this->display(__FILE__, 'views/templates/admin/list_action_enable.tpl');
     }
 
     public function displayUnsubscribeLink($token = null, $id, $name = null)
     {
-        $this->smarty->assign(array(
+        $this->smarty->assign([
             'href' => $this->_helperlist->currentIndex . '&subscribedcustomer&' . $this->_helperlist->identifier . '=' . $id . '&token=' . $token,
-            'action' => $this->trans('Unsubscribe', array(), 'Modules.Emailsubscription.Admin'),
-        ));
+            'action' => $this->trans('Unsubscribe', [], 'Modules.Emailsubscription.Admin'),
+        ]);
 
         return $this->display(__FILE__, 'views/templates/admin/list_action_unsubscribe.tpl');
     }
@@ -386,8 +415,8 @@ public function isNewsletterRegistered($customer_email)
      * Register in email subscription.
      *
      * @param string|null $hookName For widgets displayed by a hook, hook name must be passed
-     * as multiple hooks might be used, so it is necessary to know which one was used for
-     * submitting the form
+     *                              as multiple hooks might be used, so it is necessary to know which one was used for
+     *                              submitting the form
      *
      * @return bool|string
      */
@@ -412,55 +441,51 @@ public function newsletterRegistration($hookName = null)
                 'hookError' => &$hookError,
             ]
         );
+        /** @var string|null $hookError */
         if ($hookError !== null) {
             return $this->error = $hookError;
         }
 
         if (empty($_POST['email']) || !Validate::isEmail($_POST['email'])) {
-            return $this->error = $this->trans('Invalid email address.', array(), 'Shop.Notifications.Error');
-
+            return $this->error = $this->trans('Invalid email address.', [], 'Shop.Notifications.Error');
         } elseif ($_POST['action'] == '1') {
             $register_status = $this->isNewsletterRegistered($_POST['email']);
 
             if ($register_status < 1) {
-                return $this->error = $this->trans('This email address is not registered.', array(), 'Modules.Emailsubscription.Shop');
+                return $this->error = $this->trans('This email address is not registered.', [], 'Modules.Emailsubscription.Shop');
             }
 
             if (!$this->unregister($_POST['email'], $register_status)) {
-                return $this->error = $this->trans('An error occurred while attempting to unsubscribe.', array(), 'Modules.Emailsubscription.Shop');
+                return $this->error = $this->trans('An error occurred while attempting to unsubscribe.', [], 'Modules.Emailsubscription.Shop');
             }
 
-            return $this->valid = $this->trans('Unsubscription successful.', array(), 'Modules.Emailsubscription.Shop');
-
+            return $this->valid = $this->trans('Unsubscription successful.', [], 'Modules.Emailsubscription.Shop');
         } elseif ($_POST['action'] == '0') {
-
             $register_status = $this->isNewsletterRegistered($_POST['email']);
             if ($register_status > 0) {
-                return $this->error = $this->trans('This email address is already registered.', array(), 'Modules.Emailsubscription.Shop');
+                return $this->error = $this->trans('This email address is already registered.', [], 'Modules.Emailsubscription.Shop');
             }
 
             $email = pSQL($_POST['email']);
             if (!$this->isRegistered($register_status)) {
                 if (Configuration::get('NW_VERIFICATION_EMAIL')) {
-
                     // create an unactive entry in the newsletter database
                     if ($register_status == self::GUEST_NOT_REGISTERED) {
                         $this->registerGuest($email, false);
                     }
 
                     if (!$token = $this->getToken($email, $register_status)) {
-                        return $this->error = $this->trans('An error occurred during the subscription process.', array(), 'Modules.Emailsubscription.Shop');
+                        return $this->error = $this->trans('An error occurred during the subscription process.', [], 'Modules.Emailsubscription.Shop');
                     }
 
                     $this->sendVerificationEmail($email, $token);
 
-                    return $this->valid = $this->trans('A verification email has been sent. Please check your inbox.', array(), 'Modules.Emailsubscription.Shop');
-
+                    return $this->valid = $this->trans('A verification email has been sent. Please check your inbox.', [], 'Modules.Emailsubscription.Shop');
                 } else {
                     if ($this->register($email, $register_status)) {
-                        $this->valid = $this->trans('You have successfully subscribed to this newsletter.', array(), 'Modules.Emailsubscription.Shop');
+                        $this->valid = $this->trans('You have successfully subscribed to this newsletter.', [], 'Modules.Emailsubscription.Shop');
                     } else {
-                        return $this->error = $this->trans('An error occurred during the subscription process.', array(), 'Modules.Emailsubscription.Shop');
+                        return $this->error = $this->trans('An error occurred during the subscription process.', [], 'Modules.Emailsubscription.Shop');
                     }
 
                     if ($code = Configuration::get('NW_VOUCHER_CODE')) {
@@ -483,6 +508,8 @@ public function newsletterRegistration($hookName = null)
                 'error' => &$this->error,
             ]
         );
+
+        return true;
     }
 
     public function getSubscribers()
@@ -499,7 +526,7 @@ public function getSubscribers()
             $dbquery->where('c.`email` LIKE \'%' . pSQL($this->_searched_email) . '%\' ');
         }
 
-        $customers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($dbquery->build());
+        $customers = Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->executeS($dbquery->build());
 
         $dbquery = new DbQuery();
         $dbquery->select('CONCAT(\'N\', e.`id`) AS `id`, s.`name` AS `shop_name`, NULL AS `gender`, NULL AS `lastname`, NULL AS `firstname`, e.`email`, e.`active` AS `subscribed`, e.`newsletter_date_add`, l.`iso_code`');
@@ -538,7 +565,7 @@ protected function isRegistered($register_status)
     {
         return in_array(
             $register_status,
-            array(self::GUEST_REGISTERED, self::CUSTOMER_REGISTERED)
+            [self::GUEST_REGISTERED, self::CUSTOMER_REGISTERED]
         );
     }
 
@@ -671,23 +698,25 @@ protected function getUserEmailByToken($token)
      * Return a token associated to an user.
      *
      * @param string $email
-     * @param string $register_status
+     * @param int $register_status
      */
     protected function getToken($email, $register_status)
     {
-        if (in_array($register_status, array(self::GUEST_NOT_REGISTERED, self::GUEST_REGISTERED))) {
+        if (in_array($register_status, [self::GUEST_NOT_REGISTERED, self::GUEST_REGISTERED])) {
             $sql = 'SELECT MD5(CONCAT( `email` , `newsletter_date_add`, \'' . pSQL(Configuration::get('NW_SALT')) . '\')) as token
                     FROM `' . _DB_PREFIX_ . 'emailsubscription`
                     WHERE `active` = 0
                     AND `email` = \'' . pSQL($email) . '\'';
-        } elseif ($register_status == self::CUSTOMER_NOT_REGISTERED) {
+            return Db::getInstance()->getValue($sql);
+        }
+        if ($register_status == self::CUSTOMER_NOT_REGISTERED) {
             $sql = 'SELECT MD5(CONCAT( `email` , `date_add`, \'' . pSQL(Configuration::get('NW_SALT')) . '\' )) as token
                     FROM `' . _DB_PREFIX_ . 'customer`
                     WHERE `newsletter` = 0
                     AND `email` = \'' . pSQL($email) . '\'';
+            return Db::getInstance()->getValue($sql);
         }
-
-        return Db::getInstance()->getValue($sql);
+        return '';
     }
 
     /**
@@ -708,7 +737,7 @@ public function confirmEmail($token)
         }
 
         if (!$activated) {
-            return $this->trans('This email is already registered and/or invalid.', array(), 'Modules.Emailsubscription.Shop');
+            return $this->trans('This email is already registered and/or invalid.', [], 'Modules.Emailsubscription.Shop');
         }
 
         if ($discount = Configuration::get('NW_VOUCHER_CODE')) {
@@ -719,7 +748,7 @@ public function confirmEmail($token)
             $this->sendConfirmationEmail($email);
         }
 
-        return $this->trans('Thank you for subscribing to our newsletter.', array(), 'Modules.Emailsubscription.Shop');
+        return $this->trans('Thank you for subscribing to our newsletter.', [], 'Modules.Emailsubscription.Shop');
     }
 
     /**
@@ -745,8 +774,8 @@ public function confirmSubscription($email)
     /**
      * Send an email containing a voucher code.
      *
-     * @param $email
-     * @param $code
+     * @param string $email
+     * @param string $code
      *
      * @return bool|int
      */
@@ -754,18 +783,18 @@ protected function sendVoucher($email, $code)
     {
         $language = new Language($this->context->language->id);
 
-        return Mail::Send(
+        return Mail::send(
             $this->context->language->id,
             'newsletter_voucher',
             $this->trans(
                 'Newsletter voucher',
-                array(),
+                [],
                 'Emails.Subject',
                 $language->locale
             ),
-            array(
+            [
                 '{discount}' => $code,
-            ),
+            ],
             $email,
             null,
             null,
@@ -789,16 +818,16 @@ protected function sendConfirmationEmail($email)
     {
         $language = new Language($this->context->language->id);
 
-        return Mail::Send(
+        return Mail::send(
             $this->context->language->id,
             'newsletter_conf',
             $this->trans(
                 'Newsletter confirmation',
-                array(),
+                [],
                 'Emails.Subject',
                 $language->locale
             ),
-            array(),
+            [],
             pSQL($email),
             null,
             null,
@@ -822,24 +851,24 @@ protected function sendConfirmationEmail($email)
     protected function sendVerificationEmail($email, $token)
     {
         $verif_url = Context::getContext()->link->getModuleLink(
-            'ps_emailsubscription', 'verification', array(
+            'ps_emailsubscription', 'verification', [
                 'token' => $token,
-            )
+            ]
         );
         $language = new Language($this->context->language->id);
 
-        return Mail::Send(
+        return Mail::send(
             $this->context->language->id,
             'newsletter_verif',
             $this->trans(
                 'Email verification',
-                array(),
+                [],
                 'Emails.Subject',
                 $language->locale
             ),
-            array(
+            [
                 '{verif_url}' => $verif_url,
-            ),
+            ],
             $email,
             null,
             null,
@@ -860,10 +889,10 @@ public function renderWidget($hookName = null, array $configuration = [])
 
         $template_file = ($hookName == 'displayLeftColumn') ? self::TPL_COLUMN : self::TPL_DEFAULT;
         $this->smarty->assign($this->getWidgetVariables($hookName, $configuration));
-        $this->context->smarty->assign(array(
+        $this->context->smarty->assign([
             'id_module' => $this->id,
             'hookName' => $hookName,
-        ));
+        ]);
 
         return $this->fetch('module:ps_emailsubscription/views/templates/hook/' . $template_file);
     }
@@ -876,14 +905,15 @@ public function getWidgetVariables($hookName = null, array $configuration = [])
         $variables['conditions'] = Configuration::get('NW_CONDITIONS', $this->context->language->id);
 
         if (Tools::isSubmit('submitNewsletter')) {
-            $this->error = $this->valid = '';
+            $this->error = $this->valid = false;
             $this->newsletterRegistration($hookName);
 
+            /** @phpstan-ignore-next-line */
             if ($this->error) {
                 $variables['value'] = Tools::getValue('email', '');
                 $variables['msg'] = $this->error;
                 $variables['nw_error'] = true;
-            } elseif ($this->valid) {
+            } elseif ($this->valid) { /** @phpstan-ignore-line */
                 $variables['value'] = Tools::getValue('email', '');
                 $variables['msg'] = $this->valid;
                 $variables['nw_error'] = false;
@@ -905,7 +935,7 @@ public function hookActionFrontControllerSetMedia()
     /**
      * Deletes duplicates email in newsletter table.
      *
-     * @param $params
+     * @param array $params
      *
      * @return bool
      */
@@ -914,7 +944,7 @@ public function hookActionCustomerAccountAdd($params)
         //if e-mail of the created user address has already been added to the newsletter through the ps_emailsubscription module,
         //we delete it from ps_emailsubscription table to prevent duplicates
         if (empty($params['newCustomer'])) {
-            return;
+            return false;
         }
         $id_shop = $params['newCustomer']->id_shop;
         $email = $params['newCustomer']->email;
@@ -939,11 +969,11 @@ public function hookActionCustomerAccountAdd($params)
         return true;
     }
 
-   public function hookActionObjectCustomerUpdateBefore($params)
-   {
-       $customer = new Customer($params['object']->id);
-       $this->_origin_newsletter = (int)$customer->newsletter;
-   }
+    public function hookActionObjectCustomerUpdateBefore($params)
+    {
+        $customer = new Customer($params['object']->id);
+        $this->_origin_newsletter = (int) $customer->newsletter;
+    }
 
     public function hookActionCustomerAccountUpdate($params)
     {
@@ -955,7 +985,7 @@ public function hookActionCustomerAccountUpdate($params)
         }
         if ($code = Configuration::get('NW_VOUCHER_CODE')) {
             $cartRule = CartRuleCore::getCartsRuleByCode($code, Context::getContext()->language->id);
-            if (! Order::getDiscountsCustomer($params['customer']->id, $cartRule[0])) {// send voucher
+            if (!Order::getDiscountsCustomer($params['customer']->id, $cartRule[0])) {// send voucher
                 $this->sendVoucher($params['customer']->email, $code);
             }
         }
@@ -966,102 +996,100 @@ public function hookActionCustomerAccountUpdate($params)
     /**
      * Add an extra FormField to ask for newsletter registration.
      *
-     * @param $params
+     * @param array $params
      *
-     * @return bool
+     * @return array<FormField>
      */
     public function hookAdditionalCustomerFormFields($params)
     {
         $label = $this->trans(
             'Sign up for our newsletter[1][2]%conditions%[/2]',
-            array(
+            [
                 '[1]' => '<br>',
                 '[2]' => '<em>',
                 '%conditions%' => Tools::htmlentitiesUTF8(
                     Configuration::get('NW_CONDITIONS', $this->context->language->id)
                 ),
                 '[/2]' => '</em>',
-            ),
+            ],
             'Modules.Emailsubscription.Shop'
         );
 
-        return array(
-            (new FormField())
-                ->setName('newsletter')
-                ->setType('checkbox')
-                ->setLabel($label), );
+        return [
+            (new FormField())->setName('newsletter')->setType('checkbox')->setLabel($label),
+        ];
     }
 
     public function renderForm()
     {
-        $fields_form = array(
-            'form' => array(
-                'legend' => array(
-                    'title' => $this->trans('Settings', array(), 'Admin.Global'),
+        $fields_form = [
+            'form' => [
+                'legend' => [
+                    'title' => $this->trans('Settings', [], 'Admin.Global'),
                     'icon' => 'icon-cogs',
-                ),
-                'input' => array(
-                    array(
+                ],
+                'input' => [
+                    [
                         'type' => 'switch',
-                        'label' => $this->trans('Would you like to send a verification email after subscription?', array(), 'Modules.Emailsubscription.Admin'),
+                        'label' => $this->trans('Would you like to send a verification email after subscription?', [], 'Modules.Emailsubscription.Admin'),
                         'name' => 'NW_VERIFICATION_EMAIL',
-                        'values' => array(
-                            array(
+                        'values' => [
+                            [
                                 'id' => 'active_on',
                                 'value' => 1,
-                                'label' => $this->trans('Yes', array(), 'Admin.Global'),
-                            ),
-                            array(
+                                'label' => $this->trans('Yes', [], 'Admin.Global'),
+                            ],
+                            [
                                 'id' => 'active_off',
                                 'value' => 0,
-                                'label' => $this->trans('No', array(), 'Admin.Global'),
-                            ),
-                        ),
-                    ),
-                    array(
+                                'label' => $this->trans('No', [], 'Admin.Global'),
+                            ],
+                        ],
+                    ],
+                    [
                         'type' => 'switch',
-                        'label' => $this->trans('Would you like to send a confirmation email after subscription?', array(), 'Modules.Emailsubscription.Admin'),
+                        'label' => $this->trans('Would you like to send a confirmation email after subscription?', [], 'Modules.Emailsubscription.Admin'),
                         'name' => 'NW_CONFIRMATION_EMAIL',
-                        'values' => array(
-                            array(
+                        'values' => [
+                            [
                                 'id' => 'active_on',
                                 'value' => 1,
-                                'label' => $this->trans('Yes', array(), 'Admin.Global'),
-                            ),
-                            array(
+                                'label' => $this->trans('Yes', [], 'Admin.Global'),
+                            ],
+                            [
                                 'id' => 'active_off',
                                 'value' => 0,
-                                'label' => $this->trans('No', array(), 'Admin.Global'),
-                            ),
-                        ),
-                    ),
-                    array(
+                                'label' => $this->trans('No', [], 'Admin.Global'),
+                            ],
+                        ],
+                    ],
+                    [
                         'type' => 'text',
-                        'label' => $this->trans('Welcome voucher code', array(), 'Modules.Emailsubscription.Admin'),
+                        'label' => $this->trans('Welcome voucher code', [], 'Modules.Emailsubscription.Admin'),
                         'name' => 'NW_VOUCHER_CODE',
                         'class' => 'fixed-width-md',
-                        'desc' => $this->trans('Leave blank to disable by default.', array(), 'Modules.Emailsubscription.Admin'),
-                    ),
-                    array(
+                        'desc' => $this->trans('Leave blank to disable by default.', [], 'Modules.Emailsubscription.Admin'),
+                    ],
+                    [
                         'type' => 'textarea',
-                        'label' => $this->trans('Newsletter conditions', array(), 'Modules.Emailsubscription.Admin'),
+                        'label' => $this->trans('Newsletter conditions', [], 'Modules.Emailsubscription.Admin'),
                         'lang' => true,
                         'name' => 'NW_CONDITIONS',
                         'cols' => 40,
                         'rows' => 100,
                         'hint' => $this->trans(
                             'This text will be displayed beneath the newsletter subscribe button.',
-                            array(),
+                            [],
                             'Modules.Emailsubscription.Admin'
                         ),
-                        'desc' => $this->trans('Leave blank to disable by default.', array(), 'Modules.Emailsubscription.Admin'),
-                    ),
-                ),
-                'submit' => array(
-                    'title' => $this->trans('Save', array(), 'Admin.Actions'),
-                ),
-            ),
-        );
+                        'desc' => $this->trans('Leave blank to disable by default.', [], 'Modules.Emailsubscription.Admin'),
+                    ],
+                ],
+                'submit' => [
+                    'title' => $this->trans('Save', [], 'Admin.Actions'),
+                ],
+            ],
+        ];
 
         $helper = new HelperForm();
         $helper->show_toolbar = false;
@@ -1074,13 +1102,13 @@ public function renderForm()
         $helper->submit_action = 'submitUpdate';
         $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false) . '&configure=' . $this->name . '&tab_module=' . $this->tab . '&module_name=' . $this->name;
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->tpl_vars = array(
+        $helper->tpl_vars = [
             'fields_value' => $this->getConfigFieldsValues(),
             'languages' => $this->context->controller->getLanguages(),
             'id_language' => $this->context->language->id,
-        );
+        ];
 
-        return $helper->generateForm(array($fields_form));
+        return $helper->generateForm([$fields_form]);
     }
 
     public function renderExportForm()
@@ -1089,80 +1117,80 @@ public function renderExportForm()
         $countries = Country::getCountries($this->context->language->id);
 
         // ...formatting array
-        $countries_list = array(array('id' => 0, 'name' => $this->trans('All countries', array(), 'Admin.Global')));
+        $countries_list = [['id' => 0, 'name' => $this->trans('All countries', [], 'Admin.Global')]];
         foreach ($countries as $country) {
-            $countries_list[] = array('id' => $country['id_country'], 'name' => $country['name']);
+            $countries_list[] = ['id' => $country['id_country'], 'name' => $country['name']];
         }
 
-        $fields_form = array(
-            'form' => array(
-                'legend' => array(
-                    'title' => $this->trans('Export customers\' addresses', array(), 'Modules.Emailsubscription.Admin'),
+        $fields_form = [
+            'form' => [
+                'legend' => [
+                    'title' => $this->trans('Export customers\' addresses', [], 'Modules.Emailsubscription.Admin'),
                     'icon' => 'icon-envelope',
-                ),
-                'input' => array(
-                    array(
+                ],
+                'input' => [
+                    [
                         'type' => 'select',
-                        'label' => $this->trans('Customers\' country', array(), 'Modules.Emailsubscription.Admin'),
-                        'desc' => $this->trans('Filter customers by country.', array(), 'Modules.Emailsubscription.Admin'),
+                        'label' => $this->trans('Customers\' country', [], 'Modules.Emailsubscription.Admin'),
+                        'desc' => $this->trans('Filter customers by country.', [], 'Modules.Emailsubscription.Admin'),
                         'name' => 'COUNTRY',
                         'required' => false,
                         'default_value' => (int) $this->context->country->id,
-                        'options' => array(
+                        'options' => [
                             'query' => $countries_list,
                             'id' => 'id',
                             'name' => 'name',
-                        ),
-                    ),
-                    array(
+                        ],
+                    ],
+                    [
                         'type' => 'select',
-                        'label' => $this->trans('Newsletter subscribers', array(), 'Modules.Emailsubscription.Admin'),
-                        'desc' => $this->trans('Filter customers who have subscribed to the newsletter or not, and who have an account or not.', array(), 'Modules.Emailsubscription.Admin'),
-                        'hint' => $this->trans('Customers can subscribe to your newsletter when registering, or by entering their email in the newsletter form.', array(), 'Modules.Emailsubscription.Admin'),
+                        'label' => $this->trans('Newsletter subscribers', [], 'Modules.Emailsubscription.Admin'),
+                        'desc' => $this->trans('Filter customers who have subscribed to the newsletter or not, and who have an account or not.', [], 'Modules.Emailsubscription.Admin'),
+                        'hint' => $this->trans('Customers can subscribe to your newsletter when registering, or by entering their email in the newsletter form.', [], 'Modules.Emailsubscription.Admin'),
                         'name' => 'SUSCRIBERS',
                         'required' => false,
                         'default_value' => 1,
-                        'options' => array(
-                            'query' => array(
-                                array('id' => 0, 'name' => $this->trans('All subscribers', array(), 'Modules.Emailsubscription.Admin')),
-                                array('id' => 1, 'name' => $this->trans('Subscribers with account', array(), 'Modules.Emailsubscription.Admin')),
-                                array('id' => 2, 'name' => $this->trans('Subscribers without account', array(), 'Modules.Emailsubscription.Admin')),
-                                array('id' => 3, 'name' => $this->trans('Non-subscribers', array(), 'Modules.Emailsubscription.Admin')),
-                            ),
+                        'options' => [
+                            'query' => [
+                                ['id' => 0, 'name' => $this->trans('All subscribers', [], 'Modules.Emailsubscription.Admin')],
+                                ['id' => 1, 'name' => $this->trans('Subscribers with account', [], 'Modules.Emailsubscription.Admin')],
+                                ['id' => 2, 'name' => $this->trans('Subscribers without account', [], 'Modules.Emailsubscription.Admin')],
+                                ['id' => 3, 'name' => $this->trans('Non-subscribers', [], 'Modules.Emailsubscription.Admin')],
+                            ],
                             'id' => 'id',
                             'name' => 'name',
-                        ),
-                    ),
-                    array(
+                        ],
+                    ],
+                    [
                         'type' => 'select',
-                        'label' => $this->trans('Partner offers subscribers', array(), 'Modules.Emailsubscription.Admin'),
-                        'desc' => $this->trans('Filter customers who have agreed to receive your partners\' offers or not.', array(), 'Modules.Emailsubscription.Admin'),
-                        'hint' => $this->trans('Partner offers subscribers have agreed to receive your partners\' offers.', array(), 'Modules.Emailsubscription.Admin'),
+                        'label' => $this->trans('Partner offers subscribers', [], 'Modules.Emailsubscription.Admin'),
+                        'desc' => $this->trans('Filter customers who have agreed to receive your partners\' offers or not.', [], 'Modules.Emailsubscription.Admin'),
+                        'hint' => $this->trans('Partner offers subscribers have agreed to receive your partners\' offers.', [], 'Modules.Emailsubscription.Admin'),
                         'name' => 'OPTIN',
                         'required' => false,
                         'default_value' => 1,
-                        'options' => array(
-                            'query' => array(
-                                array('id' => 0, 'name' => $this->trans('All customers', array(), 'Modules.Emailsubscription.Admin')),
-                                array('id' => 2, 'name' => $this->trans('Partner offers subscribers', array(), 'Modules.Emailsubscription.Admin')),
-                                array('id' => 1, 'name' => $this->trans('Partner offers non-subscribers', array(), 'Modules.Emailsubscription.Admin')),
-                            ),
+                        'options' => [
+                            'query' => [
+                                ['id' => 0, 'name' => $this->trans('All customers', [], 'Modules.Emailsubscription.Admin')],
+                                ['id' => 2, 'name' => $this->trans('Partner offers subscribers', [], 'Modules.Emailsubscription.Admin')],
+                                ['id' => 1, 'name' => $this->trans('Partner offers non-subscribers', [], 'Modules.Emailsubscription.Admin')],
+                            ],
                             'id' => 'id',
                             'name' => 'name',
-                        ),
-                    ),
-                    array(
+                        ],
+                    ],
+                    [
                         'type' => 'hidden',
                         'name' => 'action',
-                    ),
-                ),
-                'submit' => array(
-                    'title' => $this->trans('Export .CSV file', array(), 'Admin.Actions'),
+                    ],
+                ],
+                'submit' => [
+                    'title' => $this->trans('Export .CSV file', [], 'Admin.Actions'),
                     'class' => 'btn btn-default pull-right',
                     'name' => 'submitExport',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
         $helper = new HelperForm();
         $helper->show_toolbar = false;
@@ -1175,38 +1203,38 @@ public function renderExportForm()
         $helper->submit_action = 'btnSubmit';
         $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false) . '&configure=' . $this->name . '&tab_module=' . $this->tab . '&module_name=' . $this->name;
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->tpl_vars = array(
+        $helper->tpl_vars = [
             'fields_value' => $this->getConfigFieldsValues(),
             'languages' => $this->context->controller->getLanguages(),
             'id_language' => $this->context->language->id,
-        );
+        ];
 
-        return $helper->generateForm(array($fields_form));
+        return $helper->generateForm([$fields_form]);
     }
 
     public function renderSearchForm()
     {
-        $fields_form = array(
-            'form' => array(
-                'legend' => array(
-                    'title' => $this->trans('Search for addresses', array(), 'Modules.Emailsubscription.Admin'),
+        $fields_form = [
+            'form' => [
+                'legend' => [
+                    'title' => $this->trans('Search for addresses', [], 'Modules.Emailsubscription.Admin'),
                     'icon' => 'icon-search',
-                ),
-                'input' => array(
-                    array(
+                ],
+                'input' => [
+                    [
                         'type' => 'text',
-                        'label' => $this->trans('Email address to search', array(), 'Modules.Emailsubscription.Admin'),
+                        'label' => $this->trans('Email address to search', [], 'Modules.Emailsubscription.Admin'),
                         'name' => 'searched_email',
                         'class' => 'fixed-width-xxl',
-                        'desc' => $this->trans('Example: contact@prestashop.com or @prestashop.com', array(), 'Modules.Emailsubscription.Admin'),
-                    ),
-                ),
-                'submit' => array(
-                    'title' => $this->trans('Search', array(), 'Admin.Actions'),
+                        'desc' => $this->trans('Example: contact@prestashop.com or @prestashop.com', [], 'Modules.Emailsubscription.Admin'),
+                    ],
+                ],
+                'submit' => [
+                    'title' => $this->trans('Search', [], 'Admin.Actions'),
                     'icon' => 'process-icon-refresh',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
         $helper = new HelperForm();
         $helper->table = $this->table;
@@ -1214,18 +1242,18 @@ public function renderSearchForm()
         $helper->submit_action = 'searchEmail';
         $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false) . '&configure=' . $this->name . '&tab_module=' . $this->tab . '&module_name=' . $this->name;
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->tpl_vars = array(
-            'fields_value' => array('searched_email' => $this->_searched_email),
+        $helper->tpl_vars = [
+            'fields_value' => ['searched_email' => $this->_searched_email],
             'languages' => $this->context->controller->getLanguages(),
             'id_language' => $this->context->language->id,
-        );
+        ];
 
-        return $helper->generateForm(array($fields_form));
+        return $helper->generateForm([$fields_form]);
     }
 
     public function getConfigFieldsValues()
     {
-        $conditions = array();
+        $conditions = [];
         $languages = Language::getLanguages(false);
         foreach ($languages as $lang) {
             $conditions[$lang['id_lang']] = Tools::getValue(
@@ -1235,7 +1263,7 @@ public function getConfigFieldsValues()
             );
         }
 
-        return array(
+        return [
             'NW_VERIFICATION_EMAIL' => Tools::getValue('NW_VERIFICATION_EMAIL', Configuration::get('NW_VERIFICATION_EMAIL')),
             'NW_CONFIRMATION_EMAIL' => Tools::getValue('NW_CONFIRMATION_EMAIL', Configuration::get('NW_CONFIRMATION_EMAIL')),
             'NW_VOUCHER_CODE' => Tools::getValue('NW_VOUCHER_CODE', Configuration::get('NW_VOUCHER_CODE')),
@@ -1244,7 +1272,7 @@ public function getConfigFieldsValues()
             'SUSCRIBERS' => Tools::getValue('SUSCRIBERS'),
             'OPTIN' => Tools::getValue('OPTIN'),
             'action' => 'customers',
-        );
+        ];
     }
 
     public function export_csv()
@@ -1257,11 +1285,10 @@ public function export_csv()
 
         if ($result) {
             if (!$nb = count($result)) {
-                $this->_html .= $this->displayError($this->trans('No customers found with these filters!', array(), 'Modules.Emailsubscription.Admin'));
-
+                $this->_html .= $this->displayError($this->trans('No customers found with these filters!', [], 'Modules.Emailsubscription.Admin'));
             } elseif ($fd = @fopen(dirname(__FILE__) . '/' . strval(preg_replace('#\.{2,}#', '.', Tools::getValue('action'))) . '_' . $this->file, 'w')) {
-                $header = array('id', 'shop_name', 'gender', 'lastname', 'firstname', 'email', 'subscribed', 'subscribed_on', 'iso_language');
-                $array_to_export = array_merge(array($header), $result);
+                $header = ['id', 'shop_name', 'gender', 'lastname', 'firstname', 'email', 'subscribed', 'subscribed_on', 'iso_language'];
+                $array_to_export = array_merge([$header], $result);
 
                 foreach ($array_to_export as $tab) {
                     $this->myFputCsv($fd, $tab);
@@ -1270,45 +1297,22 @@ public function export_csv()
                 fclose($fd);
 
                 $this->_html .= $this->displayConfirmation(
-                    sprintf($this->trans('The .CSV file has been successfully exported: %d customers found.', array(), 'Modules.Emailsubscription.Admin'), $nb) . '<br />
+                    sprintf($this->trans('The .CSV file has been successfully exported: %d customers found.', [], 'Modules.Emailsubscription.Admin'), $nb) . '<br />
                 <a href="' . $this->context->shop->getBaseURI() . 'modules/ps_emailsubscription/' . Tools::safeOutput(strval(Tools::getValue('action'))) . '_' . $this->file . '">
-                <b>' . $this->trans('Download the file', array(), 'Modules.Emailsubscription.Admin') . ' ' . $this->file . '</b>
+                <b>' . $this->trans('Download the file', [], 'Modules.Emailsubscription.Admin') . ' ' . $this->file . '</b>
                 </a>
                 <br />
                 <ol style="margin-top: 10px;">
                     <li style="color: red;">' .
-                    $this->trans('WARNING: When opening this .csv file with Excel, choose UTF-8 encoding to avoid strange characters.', array(), 'Modules.Emailsubscription.Admin') .
+                    $this->trans('WARNING: When opening this .csv file with Excel, choose UTF-8 encoding to avoid strange characters.', [], 'Modules.Emailsubscription.Admin') .
                     '</li>
                 </ol>');
             } else {
-                $this->_html .= $this->displayError($this->trans('Error: Write access limited', array(), 'Modules.Emailsubscription.Admin') . ' ' . dirname(__FILE__) . '/' . strval(Tools::getValue('action')) . '_' . $this->file . ' !');
+                $this->_html .= $this->displayError($this->trans('Error: Write access limited', [], 'Modules.Emailsubscription.Admin') . ' ' . dirname(__FILE__) . '/' . strval(Tools::getValue('action')) . '_' . $this->file . ' !');
             }
         } else {
-            $this->_html .= $this->displayError($this->trans('No result found!', array(), 'Modules.Emailsubscription.Admin'));
-        }
-    }
-
-    private function getCMSRoles()
-    {
-        $cms_repository = $this->entity_manager->getRepository('CMS');
-        $id_lang = Context::getContext()->employee->id_lang;
-        $id_shop = Context::getContext()->shop->id;
-        $cms_pages = array();
-
-        $fake_object = new stdClass();
-        $fake_object->id = 0;
-        $fake_object->name = $this->trans('-- Select associated page --', array(), 'Modules.Emailsubscription.Admin');
-        $cms_pages[-1] = $fake_object;
-        unset($fake_object);
-
-        foreach ($cms_repository->i10nFindAll($id_lang, $id_shop) as $cms_page) {
-            $object = new stdClass();
-            $object->id = $cms_page->id;
-            $object->name = $cms_page->meta_title;
-            $cms_pages[] = $object;
+            $this->_html .= $this->displayError($this->trans('No result found!', [], 'Modules.Emailsubscription.Admin'));
         }
-
-        return $cms_pages;
     }
 
     private function getCustomers()
@@ -1327,7 +1331,7 @@ private function getCustomers()
             $id_shop = (int) Context::getContext()->shop->id;
         }
 
-        $customers = array();
+        $customers = [];
         if ($who == 1 || $who == 0 || $who == 3) {
             $dbquery = new DbQuery();
             $dbquery->select('c.`id_customer` AS `id`, s.`name` AS `shop_name`, gl.`name` AS `gender`, c.`lastname`, c.`firstname`, c.`email`, c.`newsletter` AS `subscribed`, c.`newsletter_date_add`, l.`iso_code`');
@@ -1341,20 +1345,22 @@ private function getCustomers()
                 $dbquery->where('c.`optin` = ' . ($optin == 1 ? 0 : 1));
             }
             if ($country) {
-                $dbquery->where('(SELECT COUNT(a.`id_address`) as nb_country
-                                                    FROM `' . _DB_PREFIX_ . 'address` a
-                                                    WHERE a.deleted = 0
-                                                    AND a.`id_customer` = c.`id_customer`
-                                                    AND a.`id_country` = ' . $country . ') >= 1');
+                $dbquery->where(
+                    '(SELECT COUNT(a.`id_address`) as nb_country
+                    FROM `' . _DB_PREFIX_ . 'address` a
+                    WHERE a.deleted = 0
+                    AND a.`id_customer` = c.`id_customer`
+                    AND a.`id_country` = ' . $country . ') >= 1'
+                );
             }
             if ($id_shop) {
                 $dbquery->where('c.`id_shop` = ' . $id_shop);
             }
 
-            $customers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($dbquery->build());
+            $customers = Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->executeS($dbquery->build());
         }
 
-        $non_customers = array();
+        $non_customers = [];
         if (($who == 0 || $who == 2) && (!$optin || $optin == 2) && !$country) {
             $dbquery = new DbQuery();
             $dbquery->select('CONCAT(\'N\', e.`id`) AS `id`, s.`name` AS `shop_name`, NULL AS `gender`, NULL AS `lastname`, NULL AS `firstname`, e.`email`, e.`active` AS `subscribed`, e.`newsletter_date_add`, l.`iso_code`');
@@ -1378,7 +1384,7 @@ private function myFputCsv($fd, $array)
         $line = implode(';', $array);
         $line .= "\n";
         if (!fwrite($fd, $line, 4096)) {
-            $this->post_errors[] = $this->trans('Error: Write access limited', array(), 'Modules.Emailsubscription.Admin') . ' ' . dirname(__FILE__) . '/' . $this->file . ' !';
+            $this->post_errors[] = $this->trans('Error: Write access limited', [], 'Modules.Emailsubscription.Admin') . ' ' . dirname(__FILE__) . '/' . $this->file . ' !';
         }
     }
 
@@ -1387,7 +1393,7 @@ private function getConditionFixtures($lang)
         $locale = $lang['locale'];
 
         return
-            $this->trans('You may unsubscribe at any moment. For that purpose, please find our contact info in the legal notice.', array(), 'Modules.Emailsubscription.Shop', $locale)
+            $this->trans('You may unsubscribe at any moment. For that purpose, please find our contact info in the legal notice.', [], 'Modules.Emailsubscription.Shop', $locale)
         ;
     }
 
@@ -1398,33 +1404,33 @@ private function getConditionFixtures($lang)
      */
     public function hookDisplayAdminCustomersForm()
     {
-        $newsletter = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT `newsletter`
+        $newsletter = Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->getValue('SELECT `newsletter`
             FROM ' . _DB_PREFIX_ . 'customer
             WHERE `id_customer` = ' . (int) Tools::getValue('id_customer', 0));
 
-        $input = array(
+        $input = [
             'type' => 'switch',
-            'label' => $this->trans('Newsletter', array(), 'Admin.Orderscustomers.Feature'),
+            'label' => $this->trans('Newsletter', [], 'Admin.Orderscustomers.Feature'),
             'name' => 'newsletter',
             'required' => false,
             'class' => 't',
             'is_bool' => true,
             'value' => $newsletter,
-            'values' => array(
-                array(
+            'values' => [
+                [
                     'id' => 'newsletter_on',
                     'value' => 1,
-                    'label' => $this->trans('Enabled', array(), 'Admin.Global'),
-                ),
-                array(
+                    'label' => $this->trans('Enabled', [], 'Admin.Global'),
+                ],
+                [
                     'id' => 'newsletter_off',
                     'value' => 0,
-                    'label' => $this->trans('Disabled', array(), 'Admin.Global'),
-                ),
-            ),
-            'hint' => $this->trans('This customer will receive your newsletter via email.', array(), 'Admin.Orderscustomers.Help'),
-        );
-        $this->context->smarty->assign(array('input' => $input));
+                    'label' => $this->trans('Disabled', [], 'Admin.Global'),
+                ],
+            ],
+            'hint' => $this->trans('This customer will receive your newsletter via email.', [], 'Admin.Orderscustomers.Help'),
+        ];
+        $this->context->smarty->assign(['input' => $input]);
 
         return $this->display(__FILE__, 'views/templates/admin/newsletter_subscribe.tpl');
     }
@@ -1437,7 +1443,7 @@ public function hookActionDeleteGDPRCustomer($customer)
                 return json_encode(true);
             }
 
-            return json_encode($this->trans('Newsletter subscription: no email to delete, this customer has not registered.', array(), 'Modules.Emailsubscription.Admin'));
+            return json_encode($this->trans('Newsletter subscription: no email to delete, this customer has not registered.', [], 'Modules.Emailsubscription.Admin'));
         }
     }
 
@@ -1449,7 +1455,7 @@ public function hookActionExportGDPRData($customer)
                 return json_encode($res);
             }
 
-            return json_encode($this->trans('Newsletter subscription: no email to export, this customer has not registered.', array(), 'Modules.Emailsubscription.Admin'));
+            return json_encode($this->trans('Newsletter subscription: no email to export, this customer has not registered.', [], 'Modules.Emailsubscription.Admin'));
         }
     }
 }
diff --git a/tests/index.php b/tests/index.php
index b3b3924..b7d9ae0 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/tests/phpstan.sh b/tests/phpstan.sh
old mode 100644
new mode 100755
index be0b961..c00eb53
--- a/tests/phpstan.sh
+++ b/tests/phpstan.sh
@@ -25,4 +25,4 @@ docker run --rm --volumes-from temp-ps \
        -e _PS_ROOT_DIR_=/var/www/html \
        --workdir=/var/www/html/modules/ps_emailsubscription phpstan/phpstan:0.12 \
        analyse \
-       --configuration=/var/www/html/modules/ps_emailsubscription/tests/phpstan-$PS_VERSION.neon
+       --configuration=/var/www/html/modules/ps_emailsubscription/tests/phpstan/phpstan-$PS_VERSION.neon
diff --git a/tests/phpstan/index.php b/tests/phpstan/index.php
index b3b3924..b7d9ae0 100644
--- a/tests/phpstan/index.php
+++ b/tests/phpstan/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/tests/phpstan/phpstan-1.7.1.2.neon b/tests/phpstan/phpstan-1.7.1.2.neon
index c604f7c..e9df73e 100644
--- a/tests/phpstan/phpstan-1.7.1.2.neon
+++ b/tests/phpstan/phpstan-1.7.1.2.neon
@@ -1,2 +1,12 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie::\$shop.#' 
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
+    - '#Call to method assign\(\) on an unknown class Smarty_Data#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore::registerHook\(\) expects string, array<int, string> given.#'
+    - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
+    - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
+    - '#Parameter \#4 \$templateVars of static method MailCore::Send\(\) expects string, array<string, string> given.#'
\ No newline at end of file
diff --git a/tests/phpstan/phpstan-1.7.2.5.neon b/tests/phpstan/phpstan-1.7.2.5.neon
index c604f7c..b8a596f 100644
--- a/tests/phpstan/phpstan-1.7.2.5.neon
+++ b/tests/phpstan/phpstan-1.7.2.5.neon
@@ -1,2 +1,12 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie::\$shop.#'
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
+    - '#Call to method assign\(\) on an unknown class Smarty_Data#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore::registerHook\(\) expects string, array<int, string> given.#'
+    - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
+    - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
+    - '#Parameter \#4 \$templateVars of static method MailCore::Send\(\) expects string, array<string, string> given.#'
\ No newline at end of file
diff --git a/tests/phpstan/phpstan-1.7.3.4.neon b/tests/phpstan/phpstan-1.7.3.4.neon
index c604f7c..a30bd45 100644
--- a/tests/phpstan/phpstan-1.7.3.4.neon
+++ b/tests/phpstan/phpstan-1.7.3.4.neon
@@ -1,2 +1,12 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie::\$shop.#'
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
+    - '#Call to method assign\(\) on an unknown class Smarty_Data#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore::registerHook\(\) expects string, array<int, string> given.#'
+    - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
+    - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
+    - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
diff --git a/tests/phpstan/phpstan-1.7.4.4.neon b/tests/phpstan/phpstan-1.7.4.4.neon
index c604f7c..4a2f883 100644
--- a/tests/phpstan/phpstan-1.7.4.4.neon
+++ b/tests/phpstan/phpstan-1.7.4.4.neon
@@ -1,2 +1,9 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie::\$shop.#'
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore::registerHook\(\) expects string, array<int, string> given.#'
+    - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
\ No newline at end of file
diff --git a/tests/phpstan/phpstan-1.7.5.1.neon b/tests/phpstan/phpstan-1.7.5.1.neon
index c604f7c..2ea7168 100644
--- a/tests/phpstan/phpstan-1.7.5.1.neon
+++ b/tests/phpstan/phpstan-1.7.5.1.neon
@@ -1,2 +1,11 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie::\$shop.#'
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore::registerHook\(\) expects string, array<int, string> given.#'
+    - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
+    - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
+    - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
\ No newline at end of file
diff --git a/tests/phpstan/phpstan-1.7.6.9.neon b/tests/phpstan/phpstan-1.7.6.9.neon
index c604f7c..d37cba6 100644
--- a/tests/phpstan/phpstan-1.7.6.9.neon
+++ b/tests/phpstan/phpstan-1.7.6.9.neon
@@ -1,2 +1,11 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie::\$shop.#'
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
+    - '#Parameter \#1 \$hook_name of method ModuleCore::registerHook\(\) expects string, array<int, string> given.#'
+    - '#Parameter \#1 \$id of class Customer constructor expects null, int given.#'
+    - '#Parameter \#4 \$ssl of method LinkCore::getModuleLink\(\) expects null, true given.#'
+    - '#Parameter \#4 \$templateVars of static method MailCore::send\(\) expects string, array<string, string> given.#'
diff --git a/tests/phpstan/phpstan-1.7.7.3.neon b/tests/phpstan/phpstan-1.7.7.3.neon
index c604f7c..9423327 100644
--- a/tests/phpstan/phpstan-1.7.7.3.neon
+++ b/tests/phpstan/phpstan-1.7.7.3.neon
@@ -1,2 +1,7 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie::\$shop.#'
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
\ No newline at end of file
diff --git a/tests/phpstan/phpstan-latest.neon b/tests/phpstan/phpstan-latest.neon
index c604f7c..9423327 100644
--- a/tests/phpstan/phpstan-latest.neon
+++ b/tests/phpstan/phpstan-latest.neon
@@ -1,2 +1,7 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+
+parameters:
+  ignoreErrors:
+    - '#Access to an undefined property Cookie::\$shop.#'
+    - '#Access to an undefined property HelperList::\$shopLinkType.#'
\ No newline at end of file
diff --git a/translations/index.php b/translations/index.php
index b3b3924..b7d9ae0 100644
--- a/translations/index.php
+++ b/translations/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/upgrade/index.php b/upgrade/index.php
index b3b3924..b7d9ae0 100644
--- a/upgrade/index.php
+++ b/upgrade/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/upgrade/install-1-1.php b/upgrade/install-1-1.php
index bf7f4d3..b2424ed 100644
--- a/upgrade/install-1-1.php
+++ b/upgrade/install-1-1.php
@@ -23,14 +23,15 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
-if (!defined('_PS_VERSION_'))
+if (!defined('_PS_VERSION_')) {
     exit;
+}
 
 function upgrade_module_1_1($module)
 {
     $hook_to_remove_id = Hook::getIdByName('displayAfterBodyOpeningTag');
     if ($hook_to_remove_id) {
-        $module->unregisterHook((int)$hook_to_remove_id);
+        $module->unregisterHook((int) $hook_to_remove_id);
     }
 
     return Configuration::deleteByName('NW_CONFIRMATION_OPTIN');
diff --git a/upgrade/install-2.4.0.php b/upgrade/install-2.4.0.php
index b6df801..4bdd3f8 100644
--- a/upgrade/install-2.4.0.php
+++ b/upgrade/install-2.4.0.php
@@ -29,5 +29,6 @@
 function upgrade_module_2_4_0($object)
 {
     $sql = 'ALTER TABLE `' . _DB_PREFIX_ . 'emailsubscription` ADD `id_lang` INT(10) UNSIGNED NOT NULL DEFAULT \'0\' AFTER `active`;';
+
     return Db::getInstance()->execute($sql);
 }
diff --git a/upgrade/upgrade-2-3-0.php b/upgrade/upgrade-2-3-0.php
index 02b2376..3789e98 100644
--- a/upgrade/upgrade-2-3-0.php
+++ b/upgrade/upgrade-2-3-0.php
@@ -28,7 +28,7 @@
 }
 function upgrade_module_2_3_0($object)
 {
-    return ($object->registerHook('registerGDPRConsent') &&
+    return $object->registerHook('registerGDPRConsent') &&
         $object->registerHook('actionDeleteGDPRCustomer') &&
-        $object->registerHook('actionExportGDPRData'));
+        $object->registerHook('actionExportGDPRData');
 }
diff --git a/verification.php b/verification.php
index e7f4241..67127f7 100755
--- a/verification.php
+++ b/verification.php
@@ -23,8 +23,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
-
-require_once dirname(__FILE__).'/../../config/config.inc.php';
+require_once dirname(__FILE__) . '/../../config/config.inc.php';
 Tools::displayFileAsDeprecated();
 
 require_once 'ps_emailsubscription.php';
@@ -37,6 +36,6 @@
 
 $token = Tools::getValue('token');
 
-require_once dirname(__FILE__).'/../../header.php';
+require_once dirname(__FILE__) . '/../../header.php';
 echo $module->confirmEmail($token);
-require_once dirname(__FILE__).'/../../footer.php';
+require_once dirname(__FILE__) . '/../../footer.php';
diff --git a/views/index.php b/views/index.php
index b3b3924..b7d9ae0 100644
--- a/views/index.php
+++ b/views/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/views/js/index.php b/views/js/index.php
index b3b3924..b7d9ae0 100644
--- a/views/js/index.php
+++ b/views/js/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/views/templates/admin/index.php b/views/templates/admin/index.php
index b3b3924..b7d9ae0 100644
--- a/views/templates/admin/index.php
+++ b/views/templates/admin/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/views/templates/front/index.php b/views/templates/front/index.php
index b3b3924..b7d9ae0 100644
--- a/views/templates/front/index.php
+++ b/views/templates/front/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/views/templates/hook/index.php b/views/templates/hook/index.php
index b3b3924..b7d9ae0 100644
--- a/views/templates/hook/index.php
+++ b/views/templates/hook/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;
diff --git a/views/templates/index.php b/views/templates/index.php
index b3b3924..b7d9ae0 100644
--- a/views/templates/index.php
+++ b/views/templates/index.php
@@ -23,13 +23,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
 
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
+header('Location: ../');
 exit;