diff --git a/lib/API/JSON/API.php b/lib/API/JSON/API.php
index f2b6da90e1..e1717a0026 100644
--- a/lib/API/JSON/API.php
+++ b/lib/API/JSON/API.php
@@ -95,7 +95,7 @@ class API {
   }
 
   function setRequestData($data) {
-    $this->_request_api_version = !empty($data['api_version']) ? $data['api_version']: false;
+    $this->_request_api_version = !empty($data['api_version']) ? $data['api_version'] : false;
 
     $this->_request_endpoint = isset($data['endpoint'])
       ? Helpers::underscoreToCamelCase(trim($data['endpoint']))
diff --git a/lib/Analytics/Reporter.php b/lib/Analytics/Reporter.php
index 53f53745e4..762aa3aa56 100644
--- a/lib/Analytics/Reporter.php
+++ b/lib/Analytics/Reporter.php
@@ -50,7 +50,7 @@ class Reporter {
       'users_can_register' => WPFunctions::get()->getOption('users_can_register') ? 'yes' : 'no',
       'MailPoet Free version' => MAILPOET_VERSION,
       'MailPoet Premium version' => (defined('MAILPOET_PREMIUM_VERSION')) ? MAILPOET_PREMIUM_VERSION : 'N/A',
-      'Total number of subscribers' =>  Subscriber::getTotalSubscribers(),
+      'Total number of subscribers' => Subscriber::getTotalSubscribers(),
       'Sending Method' => isset($mta['method']) ? $mta['method'] : null,
       'Date of plugin installation' => $this->settings->get('installed_at'),
       'Subscribe in comments' => (boolean)$this->settings->get('subscribe.on_comment.enabled', false),
diff --git a/lib/Config/MP2Migrator.php b/lib/Config/MP2Migrator.php
index 08306535e2..7311b2b3b7 100644
--- a/lib/Config/MP2Migrator.php
+++ b/lib/Config/MP2Migrator.php
@@ -1077,7 +1077,7 @@ class MP2Migrator {
     $sending_emails_number = isset($options['sending_emails_number']) ? $options['sending_emails_number'] : '';
     $sending_emails_each = isset($options['sending_emails_each']) ? $options['sending_emails_each'] : '';
     $mta['frequency']['emails'] = $this->mapFrequencyEmails($sending_emails_number, $sending_emails_each);
-    $mta['frequency']['interval'] =  $this->mapFrequencyInterval($sending_emails_each);
+    $mta['frequency']['interval'] = $this->mapFrequencyInterval($sending_emails_each);
     $mta['host'] = isset($options['smtp_host']) ? $options['smtp_host'] : '';
     $mta['port'] = isset($options['smtp_port']) ? $options['smtp_port'] : '';
     $mta['login'] = isset($options['smtp_login']) ? $options['smtp_login'] : '';
diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index cd2be8938f..d3429bbe33 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -655,9 +655,9 @@ class Menu {
     $data['segments'] = $segments;
     $data['settings'] = $this->settings->getAll();
     $data['mss_active'] = Bridge::isMPSendingServiceEnabled();
-    $data['current_wp_user'] =  $this->wp->wpGetCurrentUser()->to_array();
-    $data['current_wp_user_firstname'] =  $this->wp->wpGetCurrentUser()->user_firstname;
-    $data['site_url'] =  $this->wp->siteUrl();
+    $data['current_wp_user'] = $this->wp->wpGetCurrentUser()->to_array();
+    $data['current_wp_user_firstname'] = $this->wp->wpGetCurrentUser()->user_firstname;
+    $data['site_url'] = $this->wp->siteUrl();
     $data['roles'] = $wp_roles->get_names();
     $data['roles']['mailpoet_all'] = $this->wp->__('In any WordPress role', 'mailpoet');
 
@@ -673,7 +673,7 @@ class Menu {
       24
     );
     $data['mailpoet_main_page'] = $this->wp->adminUrl('admin.php?page=' . self::MAIN_PAGE_SLUG);
-    $data['show_congratulate_after_first_newsletter'] = isset($data['settings']['show_congratulate_after_first_newsletter'])?$data['settings']['show_congratulate_after_first_newsletter']:'false';
+    $data['show_congratulate_after_first_newsletter'] = isset($data['settings']['show_congratulate_after_first_newsletter']) ? $data['settings']['show_congratulate_after_first_newsletter'] : 'false';
 
     $data['tracking_enabled'] = $this->settings->get('tracking.enabled');
     $data['premium_plugin_active'] = License::getLicense();
diff --git a/lib/Config/Migrator.php b/lib/Config/Migrator.php
index 5e05bd002d..6b3205c5dc 100644
--- a/lib/Config/Migrator.php
+++ b/lib/Config/Migrator.php
@@ -153,7 +153,7 @@ class Migrator {
   }
 
   function scheduledTaskSubscribers() {
-    $attributes =  [
+    $attributes = [
       'task_id int(11) unsigned NOT NULL,',
       'subscriber_id int(11) unsigned NOT NULL,',
       'processed int(1) NOT NULL,',
diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php
index 25edf76b78..d9fce62b71 100644
--- a/lib/Config/Populator.php
+++ b/lib/Config/Populator.php
@@ -226,7 +226,7 @@ class Populator {
       $sender = $this->settings->fetch('sender', []);
       $this->settings->set('subscriber_email_notification', [
         'enabled' => true,
-        'address' => isset($sender['address'])? $sender['address'] : null,
+        'address' => isset($sender['address']) ? $sender['address'] : null,
       ]);
     }
 
@@ -235,7 +235,7 @@ class Populator {
       $sender = $this->settings->fetch('sender', []);
       $this->settings->set('stats_notifications', [
         'enabled' => true,
-        'address' => isset($sender['address'])? $sender['address'] : null,
+        'address' => isset($sender['address']) ? $sender['address'] : null,
       ]);
     }
 
diff --git a/lib/Config/PopulatorData/Templates/Charity.php b/lib/Config/PopulatorData/Templates/Charity.php
index 55eb08471f..ba62dc6c28 100644
--- a/lib/Config/PopulatorData/Templates/Charity.php
+++ b/lib/Config/PopulatorData/Templates/Charity.php
@@ -711,7 +711,7 @@ class Charity {
                                           'type' => 'socialIcon',
                                           'iconType' => 'facebook',
                                           'link' => 'http://www.facebook.com',
-                                          'image' =>  $this->social_icon_url . '/07-full-symbol-black/Facebook.png',
+                                          'image' => $this->social_icon_url . '/07-full-symbol-black/Facebook.png',
                                           'height' => '32px',
                                           'width' => '32px',
                                           'text' => 'Facebook',
@@ -721,7 +721,7 @@ class Charity {
                                           'type' => 'socialIcon',
                                           'iconType' => 'twitter',
                                           'link' => 'http://www.twitter.com',
-                                          'image' =>  $this->social_icon_url . '/07-full-symbol-black/Twitter.png',
+                                          'image' => $this->social_icon_url . '/07-full-symbol-black/Twitter.png',
                                           'height' => '32px',
                                           'width' => '32px',
                                           'text' => 'Twitter',
@@ -731,7 +731,7 @@ class Charity {
                                           'type' => 'socialIcon',
                                           'iconType' => 'instagram',
                                           'link' => 'http://instagram.com',
-                                          'image' =>  $this->social_icon_url . '/07-full-symbol-black/Instagram.png',
+                                          'image' => $this->social_icon_url . '/07-full-symbol-black/Instagram.png',
                                           'height' => '32px',
                                           'width' => '32px',
                                           'text' => 'Instagram',
@@ -1080,7 +1080,7 @@ class Charity {
                       'type' => 'socialIcon',
                       'iconType' => 'facebook',
                       'link' => 'http://www.facebook.com',
-                      'image' =>  $this->social_icon_url . '/01-social/Facebook.png',
+                      'image' => $this->social_icon_url . '/01-social/Facebook.png',
                       'height' => '32px',
                       'width' => '32px',
                       'text' => 'Facebook',
@@ -1090,7 +1090,7 @@ class Charity {
                       'type' => 'socialIcon',
                       'iconType' => 'twitter',
                       'link' => 'http://www.twitter.com',
-                      'image' =>  $this->social_icon_url . '/01-social/Twitter.png',
+                      'image' => $this->social_icon_url . '/01-social/Twitter.png',
                       'height' => '32px',
                       'width' => '32px',
                       'text' => 'Twitter',
diff --git a/lib/Config/PopulatorData/Templates/PieceOfCake.php b/lib/Config/PopulatorData/Templates/PieceOfCake.php
index 77ee0dfcbf..b6c8c294cc 100644
--- a/lib/Config/PopulatorData/Templates/PieceOfCake.php
+++ b/lib/Config/PopulatorData/Templates/PieceOfCake.php
@@ -86,7 +86,7 @@ class PieceOfCake {
                   2 => [
                     'type' => 'image',
                     'link' => '',
-                    'src' =>  $this->template_image_url . '/Restaurant-Bakery-Logo-1.png',
+                    'src' => $this->template_image_url . '/Restaurant-Bakery-Logo-1.png',
                     'alt' => 'Restaurant-Bakery-Logo-1',
                     'fullWidth' => true,
                     'width' => '1280px',
@@ -109,7 +109,7 @@ class PieceOfCake {
                   4 => [
                     'type' => 'image',
                     'link' => '',
-                    'src' =>  $this->template_image_url . '/Restaurant-Bakery-Header.jpg',
+                    'src' => $this->template_image_url . '/Restaurant-Bakery-Header.jpg',
                     'alt' => 'Restaurant-Bakery-Header',
                     'fullWidth' => true,
                     'width' => '1280px',
diff --git a/lib/Cron/Workers/StatsNotifications/Worker.php b/lib/Cron/Workers/StatsNotifications/Worker.php
index 021913905b..aca24cf869 100644
--- a/lib/Cron/Workers/StatsNotifications/Worker.php
+++ b/lib/Cron/Workers/StatsNotifications/Worker.php
@@ -121,7 +121,7 @@ class Worker {
     $clicked = ($newsletter->statistics['clicked'] * 100) / $newsletter->total_sent;
     $opened = ($newsletter->statistics['opened'] * 100) / $newsletter->total_sent;
     $unsubscribed = ($newsletter->statistics['unsubscribed'] * 100) / $newsletter->total_sent;
-    $context =  [
+    $context = [
       'subject' => $newsletter->subject,
       'preheader' => sprintf(_x(
         '%1$s%% opens, %2$s%% clicks, %3$s%% unsubscribes in a nutshell.', 'newsletter open rate, click rate and unsubscribe rate', 'mailpoet'),
diff --git a/lib/Helpscout/Beacon.php b/lib/Helpscout/Beacon.php
index a68876efcf..df231cefd8 100644
--- a/lib/Helpscout/Beacon.php
+++ b/lib/Helpscout/Beacon.php
@@ -57,7 +57,7 @@ class Beacon {
       'Default FROM address' => $settings->get('sender.address'),
       'Default Reply-To address' => $settings->get('reply_to.address'),
       'Bounce Email Address' => $settings->get('bounce.address'),
-      'Total number of subscribers' =>  Subscriber::getTotalSubscribers(),
+      'Total number of subscribers' => Subscriber::getTotalSubscribers(),
       'Plugin installed at' => $settings->get('installed_at'),
     ];
   }
diff --git a/lib/Mailer/MailerError.php b/lib/Mailer/MailerError.php
index 2ddb105fc1..0357b8c90a 100644
--- a/lib/Mailer/MailerError.php
+++ b/lib/Mailer/MailerError.php
@@ -93,9 +93,9 @@ class MailerError {
     $message .= $this->message ? ' ' : '';
 
     if (count($this->subscribers_errors) === 1) {
-      $message .=  WPFunctions::get()->__('Unprocessed subscriber:', 'mailpoet') . ' ';
+      $message .= WPFunctions::get()->__('Unprocessed subscriber:', 'mailpoet') . ' ';
     } else {
-      $message .=  WPFunctions::get()->__('Unprocessed subscribers:', 'mailpoet') . ' ';
+      $message .= WPFunctions::get()->__('Unprocessed subscribers:', 'mailpoet') . ' ';
     }
 
     $message .= implode(
diff --git a/lib/Mailer/Methods/AmazonSES.php b/lib/Mailer/Methods/AmazonSES.php
index 543f2f550e..1c7ce29a0c 100644
--- a/lib/Mailer/Methods/AmazonSES.php
+++ b/lib/Mailer/Methods/AmazonSES.php
@@ -107,7 +107,7 @@ class AmazonSES {
         ])
       ->setSender($this->sender['from_email'])
       ->setReplyTo([
-          $this->reply_to['reply_to_email'] =>  $this->reply_to['reply_to_name'],
+          $this->reply_to['reply_to_email'] => $this->reply_to['reply_to_name'],
         ])
       ->setReturnPath($this->return_path)
       ->setSubject($newsletter['subject']);
diff --git a/lib/Mailer/Methods/MailPoet.php b/lib/Mailer/Methods/MailPoet.php
index f9d57a11aa..a87ef3b7e2 100644
--- a/lib/Mailer/Methods/MailPoet.php
+++ b/lib/Mailer/Methods/MailPoet.php
@@ -48,7 +48,7 @@ class MailPoet {
   }
 
   function processSendError($result, $subscriber, $newsletter) {
-    if (!empty($result['code']) && $result['code'] ===  API::RESPONSE_CODE_KEY_INVALID) {
+    if (!empty($result['code']) && $result['code'] === API::RESPONSE_CODE_KEY_INVALID) {
       Bridge::invalidateKey();
     }
     return $this->error_mapper->getErrorForResult($result, $subscriber, $this->sender, $newsletter);
diff --git a/lib/Newsletter/Editor/PostContentManager.php b/lib/Newsletter/Editor/PostContentManager.php
index 493ee246de..28842297fd 100644
--- a/lib/Newsletter/Editor/PostContentManager.php
+++ b/lib/Newsletter/Editor/PostContentManager.php
@@ -56,7 +56,7 @@ class PostContentManager {
       '<a>', '<ul>', '<ol>', '<li>', '<br>', '<blockquote>',
     ];
     if ($display_type === 'full') {
-      $tags_not_being_stripped =  array_merge($tags_not_being_stripped, ['<figure>', '<img>', '<h1>', '<h2>', '<h3>']);
+      $tags_not_being_stripped = array_merge($tags_not_being_stripped, ['<figure>', '<img>', '<h1>', '<h2>', '<h3>']);
     }
 
     $content = strip_tags($content, implode('', $tags_not_being_stripped));
diff --git a/lib/Newsletter/Renderer/Blocks/Renderer.php b/lib/Newsletter/Renderer/Blocks/Renderer.php
index 21c11ed48b..d70ab003c1 100644
--- a/lib/Newsletter/Renderer/Blocks/Renderer.php
+++ b/lib/Newsletter/Renderer/Blocks/Renderer.php
@@ -32,7 +32,7 @@ class Renderer {
 
   function render($data) {
     $column_count = count($data['blocks']);
-    $columns_layout = isset($data['columnLayout'])?$data['columnLayout']:null;
+    $columns_layout = isset($data['columnLayout']) ? $data['columnLayout'] : null;
     $column_widths = ColumnsHelper::columnWidth($column_count, $columns_layout);
     $column_content = [];
 
diff --git a/lib/Newsletter/Renderer/Blocks/Text.php b/lib/Newsletter/Renderer/Blocks/Text.php
index 991d783a3f..132a8a6f55 100644
--- a/lib/Newsletter/Renderer/Blocks/Text.php
+++ b/lib/Newsletter/Renderer/Blocks/Text.php
@@ -103,7 +103,7 @@ class Text {
       if (!preg_match('/text-align/i', $style)) {
         $style = 'text-align: left;' . $style;
       }
-      $contents =  str_replace('&', '&amp;', $paragraph->html());
+      $contents = str_replace('&', '&amp;', $paragraph->html());
       $paragraph->setTag('table');
       $paragraph->style = 'border-spacing:0;mso-table-lspace:0;mso-table-rspace:0;';
       $paragraph->width = '100%';
diff --git a/lib/Newsletter/Renderer/Columns/Renderer.php b/lib/Newsletter/Renderer/Columns/Renderer.php
index 2834611a27..965046029a 100644
--- a/lib/Newsletter/Renderer/Columns/Renderer.php
+++ b/lib/Newsletter/Renderer/Columns/Renderer.php
@@ -18,7 +18,7 @@ class Renderer {
   private function renderOneColumn($content_block, $content) {
     $template = $this->getOneColumnTemplate(
       $content_block['styles']['block'],
-      isset($content_block['image'])?$content_block['image']:null
+      isset($content_block['image']) ? $content_block['image'] : null
     );
     return $template['content_start'] . $content . $template['content_end'];
   }
@@ -48,19 +48,19 @@ class Renderer {
 
   private function renderMultipleColumns($content_block, $columns_data) {
     $columns_count = count($content_block['blocks']);
-    $columns_layout = isset($content_block['columnLayout'])?$content_block['columnLayout']:null;
+    $columns_layout = isset($content_block['columnLayout']) ? $content_block['columnLayout'] : null;
 
     $widths = ColumnsHelper::columnWidth($columns_count, $columns_layout);
     $class = ColumnsHelper::columnClass($columns_count);
     $alignment = ColumnsHelper::columnAlignment($columns_count);
     $index = 0;
-    $result = $this->getMultipleColumnsContainerStart($class, $content_block['styles']['block'], isset($content_block['image'])?$content_block['image']:null);
+    $result = $this->getMultipleColumnsContainerStart($class, $content_block['styles']['block'], isset($content_block['image']) ? $content_block['image'] : null);
     foreach ($columns_data as $content) {
       $result .= $this->getMultipleColumnsContentStart($widths[$index++], $alignment, $class);
       $result .= $content;
       $result .= $this->getMultipleColumnsContentEnd();
     }
-    $result .=  $this->getMultipleColumnsContainerEnd();
+    $result .= $this->getMultipleColumnsContainerEnd();
     return $result;
   }
 
diff --git a/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php b/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php
index 39bdb15c52..c70af0cdf3 100644
--- a/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php
+++ b/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php
@@ -24,7 +24,7 @@ class DefaultSubscribersGetter extends SubscribersGetter {
   }
 
   protected function filter($subscribers) {
-    $subscribers =  $subscribers
+    $subscribers = $subscribers
       ->selectMany(
         [
           'list_status' => SubscriberSegment::$_table . '.status',
diff --git a/lib/Util/CSS.php b/lib/Util/CSS.php
index 6c35467e05..73ab921ed6 100644
--- a/lib/Util/CSS.php
+++ b/lib/Util/CSS.php
@@ -208,8 +208,8 @@ class CSS {
           $i++;
         }
 
-        $queries .= substr($css, $start-1, $i+1-$start) . "\n";
-        $css = substr($css, 0, $start-1) . substr($css, $i);
+        $queries .= substr($css, $start - 1, $i + 1 - $start) . "\n";
+        $css = substr($css, 0, $start - 1) . substr($css, $i);
         $i = $start;
       }
     }
diff --git a/lib/Util/XLSXWriter.php b/lib/Util/XLSXWriter.php
index f17cc43c60..f9d6e9e862 100644
--- a/lib/Util/XLSXWriter.php
+++ b/lib/Util/XLSXWriter.php
@@ -13,10 +13,10 @@ class XLSXWriter
 {
   //------------------------------------------------------------------
   //http://office.microsoft.com/en-us/excel-help/excel-specifications-and-limits-HP010073849.aspx
-  const EXCEL_2007_MAX_ROW=1048576;
-  const EXCEL_2007_MAX_COL=16384;
+  const EXCEL_2007_MAX_ROW = 1048576;
+  const EXCEL_2007_MAX_COL = 16384;
   //------------------------------------------------------------------
-  protected $author ='MailPoet';
+  protected $author = 'MailPoet';
   protected $sheets = [];
   protected $shared_strings = [];//unique set
   protected $shared_string_count = 0;//count of non-unique references to the unique set
@@ -33,7 +33,7 @@ class XLSXWriter
   }
 
   public function setAuthor($author='') {
-    $this->author=$author; 
+    $this->author = $author; 
   }
 
   public function __destruct() {
@@ -102,7 +102,7 @@ class XLSXWriter
 
   protected function initializeSheet($sheet_name) {
     //if already initialized
-    if ($this->current_sheet==$sheet_name || isset($this->sheets[$sheet_name]))
+    if ($this->current_sheet == $sheet_name || isset($this->sheets[$sheet_name]))
       return;
 
     $sheet_filename = $this->tempFilename();
@@ -120,7 +120,7 @@ class XLSXWriter
     ];
     $sheet = &$this->sheets[$sheet_name];
     $tabselected = count($this->sheets) == 1 ? 'true' : 'false';//only first sheet is selected
-    $max_cell=XLSXWriter::xlsCell(self::EXCEL_2007_MAX_ROW, self::EXCEL_2007_MAX_COL);//XFE1048577
+    $max_cell = XLSXWriter::xlsCell(self::EXCEL_2007_MAX_ROW, self::EXCEL_2007_MAX_COL);//XFE1048577
     $sheet->file_writer->write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n");
     $sheet->file_writer->write('<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">');
     $sheet->file_writer->write(  '<sheetPr filterMode="false">');
@@ -200,7 +200,7 @@ class XLSXWriter
     $sheet->file_writer->fseek($sheet->max_cell_tag_start);
     $sheet->file_writer->write($max_cell_tag . str_repeat(" ", (int)$padding_length));
     $sheet->file_writer->close();
-    $sheet->finalized=true;
+    $sheet->finalized = true;
   }
 
   public function writeSheet(array $data, $sheet_name='', array $header_types=[] ) {
@@ -218,23 +218,23 @@ class XLSXWriter
   }
 
   protected function writeCell(XLSXWriter_BuffererWriter &$file, $row_number, $column_number, $value, $cell_format) {
-    static $styles = ['money'=>1,'dollar'=>1,'datetime'=>2,'date'=>3,'string'=>0];
+    static $styles = ['money' => 1,'dollar' => 1,'datetime' => 2,'date' => 3,'string' => 0];
     $cell = self::xlsCell($row_number, $column_number);
     $s = isset($styles[$cell_format]) ? $styles[$cell_format] : '0';
 
-    if (!is_scalar($value) || $value=='') { //objects, array, empty
+    if (!is_scalar($value) || $value == '') { //objects, array, empty
       $file->write('<c r="'.$cell.'" s="'.$s.'"/>');
-    } elseif ($cell_format=='date') {
+    } elseif ($cell_format == 'date') {
       $file->write('<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.intval(self::convert_date_time($value)).'</v></c>');
-    } elseif ($cell_format=='datetime') {
+    } elseif ($cell_format == 'datetime') {
       $file->write('<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
     } elseif (!is_string($value)) {
-      $file->write('<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.($value*1).'</v></c>');//int,float, etc
-    } elseif ($value{0}!='0' && filter_var($value, FILTER_VALIDATE_INT)){ //excel wants to trim leading zeros
+      $file->write('<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.($value * 1).'</v></c>');//int,float, etc
+    } elseif ($value{0} != '0' && filter_var($value, FILTER_VALIDATE_INT)){ //excel wants to trim leading zeros
       $file->write('<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.($value).'</v></c>');//numeric string
-    } elseif ($value{0}=='='){
+    } elseif ($value{0} == '='){
       $file->write('<c r="'.$cell.'" s="'.$s.'" t="s"><f>'.self::xmlspecialchars($value).'</f></c>');
-    } elseif ($value!==''){
+    } elseif ($value !== ''){
       $file->write('<c r="'.$cell.'" s="'.$s.'" t="s"><v>'.self::xmlspecialchars($this->setSharedString($value)).'</v></c>');
     }
   }
@@ -332,88 +332,88 @@ class XLSXWriter
   }
 
   protected function buildAppXML() {
-    $app_xml="";
-    $app_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
-    $app_xml.='<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><TotalTime>0</TotalTime></Properties>';
+    $app_xml = "";
+    $app_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+    $app_xml .= '<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><TotalTime>0</TotalTime></Properties>';
     return $app_xml;
   }
 
   protected function buildCoreXML() {
-    $core_xml="";
-    $core_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
-    $core_xml.='<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
-    $core_xml.='<dcterms:created xsi:type="dcterms:W3CDTF">'.date("Y-m-d\TH:i:s.00\Z").'</dcterms:created>';//$date_time = '2014-10-25T15:54:37.00Z';
-    $core_xml.='<dc:creator>'.self::xmlspecialchars($this->author).'</dc:creator>';
-    $core_xml.='<cp:revision>0</cp:revision>';
-    $core_xml.='</cp:coreProperties>';
+    $core_xml = "";
+    $core_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+    $core_xml .= '<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
+    $core_xml .= '<dcterms:created xsi:type="dcterms:W3CDTF">'.date("Y-m-d\TH:i:s.00\Z").'</dcterms:created>';//$date_time = '2014-10-25T15:54:37.00Z';
+    $core_xml .= '<dc:creator>'.self::xmlspecialchars($this->author).'</dc:creator>';
+    $core_xml .= '<cp:revision>0</cp:revision>';
+    $core_xml .= '</cp:coreProperties>';
     return $core_xml;
   }
 
   protected function buildRelationshipsXML() {
-    $rels_xml="";
-    $rels_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
-    $rels_xml.='<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
-    $rels_xml.='<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>';
-    $rels_xml.='<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>';
-    $rels_xml.='<Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>';
-    $rels_xml.="\n";
-    $rels_xml.='</Relationships>';
+    $rels_xml = "";
+    $rels_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+    $rels_xml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
+    $rels_xml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>';
+    $rels_xml .= '<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>';
+    $rels_xml .= '<Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>';
+    $rels_xml .= "\n";
+    $rels_xml .= '</Relationships>';
     return $rels_xml;
   }
 
   protected function buildWorkbookXML() {
-    $i=0;
-    $workbook_xml="";
-    $workbook_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
-    $workbook_xml.='<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">';
-    $workbook_xml.='<fileVersion appName="Calc"/><workbookPr backupFile="false" showObjects="all" date1904="false"/><workbookProtection/>';
-    $workbook_xml.='<bookViews><workbookView activeTab="0" firstSheet="0" showHorizontalScroll="true" showSheetTabs="true" showVerticalScroll="true" tabRatio="212" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"/></bookViews>';
-    $workbook_xml.='<sheets>';
+    $i = 0;
+    $workbook_xml = "";
+    $workbook_xml .= '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+    $workbook_xml .= '<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">';
+    $workbook_xml .= '<fileVersion appName="Calc"/><workbookPr backupFile="false" showObjects="all" date1904="false"/><workbookProtection/>';
+    $workbook_xml .= '<bookViews><workbookView activeTab="0" firstSheet="0" showHorizontalScroll="true" showSheetTabs="true" showVerticalScroll="true" tabRatio="212" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"/></bookViews>';
+    $workbook_xml .= '<sheets>';
     foreach ($this->sheets as $sheet_name => $sheet) {
-      $workbook_xml.='<sheet name="'.self::xmlspecialchars($sheet->sheetname).'" sheetId="'.($i+1).'" state="visible" r:id="rId'.($i+2).'"/>';
+      $workbook_xml .= '<sheet name="'.self::xmlspecialchars($sheet->sheetname).'" sheetId="'.($i + 1).'" state="visible" r:id="rId'.($i + 2).'"/>';
       $i++;
     }
-    $workbook_xml.='</sheets>';
-    $workbook_xml.='<calcPr iterateCount="100" refMode="A1" iterate="false" iterateDelta="0.001"/></workbook>';
+    $workbook_xml .= '</sheets>';
+    $workbook_xml .= '<calcPr iterateCount="100" refMode="A1" iterate="false" iterateDelta="0.001"/></workbook>';
     return $workbook_xml;
   }
 
   protected function buildWorkbookRelsXML() {
-    $i=0;
-    $wkbkrels_xml="";
-    $wkbkrels_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
-    $wkbkrels_xml.='<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
-    $wkbkrels_xml.='<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>';
+    $i = 0;
+    $wkbkrels_xml = "";
+    $wkbkrels_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+    $wkbkrels_xml .= '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
+    $wkbkrels_xml .= '<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>';
     foreach ($this->sheets as $sheet_name => $sheet) {
-      $wkbkrels_xml.='<Relationship Id="rId'.($i+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/'.($sheet->xmlname).'"/>';
+      $wkbkrels_xml .= '<Relationship Id="rId'.($i + 2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/'.($sheet->xmlname).'"/>';
       $i++;
     }
     if (!empty($this->shared_strings)) {
-      $wkbkrels_xml.='<Relationship Id="rId'.(count($this->sheets)+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>';
+      $wkbkrels_xml .= '<Relationship Id="rId'.(count($this->sheets) + 2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>';
     }
-    $wkbkrels_xml.="\n";
-    $wkbkrels_xml.='</Relationships>';
+    $wkbkrels_xml .= "\n";
+    $wkbkrels_xml .= '</Relationships>';
     return $wkbkrels_xml;
   }
 
   protected function buildContentTypesXML() {
-    $content_types_xml="";
-    $content_types_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
-    $content_types_xml.='<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
-    $content_types_xml.='<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
-    $content_types_xml.='<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
+    $content_types_xml = "";
+    $content_types_xml .= '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+    $content_types_xml .= '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
+    $content_types_xml .= '<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
+    $content_types_xml .= '<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
     foreach ($this->sheets as $sheet_name => $sheet) {
-      $content_types_xml.='<Override PartName="/xl/worksheets/'.($sheet->xmlname).'" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
+      $content_types_xml .= '<Override PartName="/xl/worksheets/'.($sheet->xmlname).'" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
     }
     if (!empty($this->shared_strings)) {
-      $content_types_xml.='<Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>';
+      $content_types_xml .= '<Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>';
     }
-    $content_types_xml.='<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>';
-    $content_types_xml.='<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>';
-    $content_types_xml.='<Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>';
-    $content_types_xml.='<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>';
-    $content_types_xml.="\n";
-    $content_types_xml.='</Types>';
+    $content_types_xml .= '<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>';
+    $content_types_xml .= '<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>';
+    $content_types_xml .= '<Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>';
+    $content_types_xml .= '<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>';
+    $content_types_xml .= "\n";
+    $content_types_xml .= '</Types>';
     return $content_types_xml;
   }
 
@@ -426,9 +426,9 @@ class XLSXWriter
   public static function xlsCell($row_number, $column_number) {
     $n = $column_number;
     for ($r = ""; $n >= 0; $n = intval($n / 26) - 1) {
-      $r = chr($n%26 + 0x41) . $r;
+      $r = chr($n % 26 + 0x41) . $r;
     }
-    return $r . ($row_number+1);
+    return $r . ($row_number + 1);
   }
   //------------------------------------------------------------------
   public static function log($string) {
@@ -457,8 +457,8 @@ class XLSXWriter
     //thanks to Excel::Writer::XLSX::Worksheet.pm (perl)
     $days    = 0;    # Number of days since epoch
     $seconds = 0;    # Time expressed as fraction of 24h hours in seconds
-    $year=$month=$day=0;
-    $hour=$min  =$sec=0;
+    $year = $month = $day = 0;
+    $hour = $min  = $sec = 0;
 
     $date_time = $date_input;
     if (preg_match("/(\d{4})\-(\d{2})\-(\d{2})/", $date_time, $matches))
@@ -474,9 +474,9 @@ class XLSXWriter
     //using 1900 as epoch, not 1904, ignoring 1904 special case
 
     # Special cases for Excel.
-    if ("$year-$month-$day"=='1899-12-31')  return $seconds      ;    # Excel 1900 epoch
-    if ("$year-$month-$day"=='1900-01-00')  return $seconds      ;    # Excel 1900 epoch
-    if ("$year-$month-$day"=='1900-02-29')  return 60 + $seconds ;    # Excel false leapday
+    if ("$year-$month-$day" == '1899-12-31')  return $seconds      ;    # Excel 1900 epoch
+    if ("$year-$month-$day" == '1900-01-00')  return $seconds      ;    # Excel 1900 epoch
+    if ("$year-$month-$day" == '1900-02-29')  return 60 + $seconds ;    # Excel false leapday
 
     # We calculate the date by calculating the number of days since the epoch
     # and adjust for the number of leap days. We calculate the number of leap
@@ -498,7 +498,7 @@ class XLSXWriter
 
     # Accumulate the number of days since the epoch.
     $days = $day;    # Add days for current month
-    $days += array_sum( array_slice($mdays, 0, $month-1 ) );    # Add days for past months
+    $days += array_sum( array_slice($mdays, 0, $month - 1 ) );    # Add days for past months
     $days += $range * 365;                      # Add days for past years
     $days += intval( ( $range ) / 4 );             # Add leapdays
     $days -= intval( ( $range + $offset ) / 100 ); # Subtract 100 year leapdays
@@ -516,20 +516,20 @@ class XLSXWriter
 
 class XLSXWriter_BuffererWriter
 {
-  protected $fd=null;
-  protected $buffer='';
-  protected $check_utf8=false;
+  protected $fd = null;
+  protected $buffer = '';
+  protected $check_utf8 = false;
 
   public function __construct($filename, $fd_fopen_flags='w', $check_utf8=false) {
     $this->check_utf8 = $check_utf8;
     $this->fd = fopen($filename, $fd_fopen_flags);
-    if ($this->fd===false) {
+    if ($this->fd === false) {
       XLSXWriter::log("Unable to open $filename for writing.");
     }
   }
 
   public function write($string) {
-    $this->buffer.=$string;
+    $this->buffer .= $string;
     if (isset($this->buffer[8191])) {
       $this->purge();
     }
@@ -542,7 +542,7 @@ class XLSXWriter_BuffererWriter
         $this->check_utf8 = false;
       }
       fwrite($this->fd, $this->buffer);
-      $this->buffer='';
+      $this->buffer = '';
     }
   }
 
@@ -550,7 +550,7 @@ class XLSXWriter_BuffererWriter
     $this->purge();
     if ($this->fd) {
       fclose($this->fd);
-      $this->fd=null;
+      $this->fd = null;
     }
   }
 
diff --git a/tasks/code_sniffer/MailPoet/ruleset.xml b/tasks/code_sniffer/MailPoet/ruleset.xml
index d00385b50b..3c4905feba 100644
--- a/tasks/code_sniffer/MailPoet/ruleset.xml
+++ b/tasks/code_sniffer/MailPoet/ruleset.xml
@@ -28,6 +28,11 @@
 
   <!-- Only short array syntax is allowed -->
   <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+  <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+    <properties>
+      <property name="ignoreNewlines" value="true" />
+    </properties>
+  </rule>
   <!-- Disallow usage of BOMs -->
   <rule ref="Generic.Files.ByteOrderMark"/>
   <!-- Lines can be 80 chars long, show errors at 120 chars -->
diff --git a/tests/acceptance/ExportSubscribersCest.php b/tests/acceptance/ExportSubscribersCest.php
index 6d1d9ddd12..4dad117330 100644
--- a/tests/acceptance/ExportSubscribersCest.php
+++ b/tests/acceptance/ExportSubscribersCest.php
@@ -21,7 +21,7 @@ class ExportSubscribersCest {
     $I->login();
     $I->amOnMailPoetPage('Subscribers');
     //export those users
-    $I->click(['xpath'=>'//*[@id="mailpoet_export_button"]']);
+    $I->click(['xpath' => '//*[@id="mailpoet_export_button"]']);
     //choose new list
     $I->selectOptionInSelect2($segment_name);
     //export
diff --git a/tests/acceptance/ManageSubscriptionLinkCest.php b/tests/acceptance/ManageSubscriptionLinkCest.php
index cd885cb698..8543d27fab 100644
--- a/tests/acceptance/ManageSubscriptionLinkCest.php
+++ b/tests/acceptance/ManageSubscriptionLinkCest.php
@@ -35,7 +35,7 @@ class ManageSubscriptionLinkCest {
     $I->click($first_template_element);
 
     // step 3 - design newsletter (update subject)
-    $title_element ='[data-automation-id="newsletter_title"]';
+    $title_element = '[data-automation-id="newsletter_title"]';
     $I->waitForElement($title_element);
     $I->fillField($title_element, $this->newsletter_title);
     $I->click('Next');
diff --git a/tests/acceptance/SettingsPageBasicsCest.php b/tests/acceptance/SettingsPageBasicsCest.php
index 6400590530..ec0288025a 100644
--- a/tests/acceptance/SettingsPageBasicsCest.php
+++ b/tests/acceptance/SettingsPageBasicsCest.php
@@ -60,7 +60,7 @@ class SettingsPageBasicsCest {
     $I->waitForText($post_title);
     $I->click($post_title);
     $I->scrollTo('.comment-form-mailpoet');
-    $I->waitForElement(['css'=>'.comment-form-mailpoet']);
+    $I->waitForElement(['css' => '.comment-form-mailpoet']);
     //clear checkbox to hide Select2 from next test
     $I->amOnMailPoetPage('Settings');
     $I->uncheckOption('#settings[subscribe_on_comment]');
diff --git a/tests/acceptance/SettingsSubscriptionPageCest.php b/tests/acceptance/SettingsSubscriptionPageCest.php
index d1f83798c1..e87f558191 100644
--- a/tests/acceptance/SettingsSubscriptionPageCest.php
+++ b/tests/acceptance/SettingsSubscriptionPageCest.php
@@ -12,12 +12,12 @@ class SettingsSubscriptionPageCest {
   }
   function createNewSubscriptionPage(\AcceptanceTester $I) {
     $I->wantTo('Make a custom subscription page');
-    $page_title='CustomSubscriptionPage';
-    $page_content='[mailpoet_manage_subscription]';
+    $page_title = 'CustomSubscriptionPage';
+    $page_content = '[mailpoet_manage_subscription]';
     $I->login();
     $I->amOnMailPoetPage('Settings');
     $I->cli('post create --allow-root --post_type=page --post_title=' . $page_title . '--post_content=' . $page_content);
-    $I->click(['css'=>'#subscription_manage_page.mailpoet_page_selection']);
+    $I->click(['css' => '#subscription_manage_page.mailpoet_page_selection']);
     $I->checkOption('select#subscription_manage_page', $page_title);
     $I->click('[data-automation-id="preview_manage_subscription_page_link"]');
     $I->waitForText('Manage your subscription');
diff --git a/tests/acceptance/SettingsUnsubscribePageCest.php b/tests/acceptance/SettingsUnsubscribePageCest.php
index cfd9c1e82f..b6f6cc1052 100644
--- a/tests/acceptance/SettingsUnsubscribePageCest.php
+++ b/tests/acceptance/SettingsUnsubscribePageCest.php
@@ -9,7 +9,7 @@ class SettingsUnsubscribePageCest {
     $I->amOnMailPoetPage('Settings');
     $I->click('[data-automation-id="unsubscribe_page_preview_link"]');
     $I->switchToNextTab();
-    $I->waitForElement(['css'=>'.entry-title']);
+    $I->waitForElement(['css' => '.entry-title']);
   }
 
 }
diff --git a/tests/acceptance/SubscribeOnRegistrationPageCest.php b/tests/acceptance/SubscribeOnRegistrationPageCest.php
index cba4479cfb..5537d12bf0 100644
--- a/tests/acceptance/SubscribeOnRegistrationPageCest.php
+++ b/tests/acceptance/SubscribeOnRegistrationPageCest.php
@@ -23,7 +23,7 @@ class SubscribeOnRegistrationPageCest {
     $I->click('[data-automation-id="settings-submit-button"]');
     $I->logOut();
     $I->amOnPage('/wp-login.php?action=register');
-    $I->waitForElement(['css'=>'.registration-form-mailpoet']);
+    $I->waitForElement(['css' => '.registration-form-mailpoet']);
     if (!getenv('MULTISITE')) {
       $I->fillField(['name' => 'user_login'], 'registerpagesignup');
       $I->fillField(['name' => 'user_email'], $regpageuseremail);
@@ -33,7 +33,7 @@ class SubscribeOnRegistrationPageCest {
     } else {
       $I->fillField(['name' => 'user_name'], 'muregisterpagesignup');
       $I->fillField(['name' => 'user_email'], $regpageuseremail);
-      $I->scrollTo(['css' =>'#mailpoet_subscribe_on_register']);
+      $I->scrollTo(['css' => '#mailpoet_subscribe_on_register']);
       $I->checkOption('#mailpoet_subscribe_on_register');
       $I->click('Next');
       $I->waitForText('muregisterpagesignup is your new username');
diff --git a/tests/acceptance/SubscriberManageImportExportCest.php b/tests/acceptance/SubscriberManageImportExportCest.php
index 1ab9b2a11c..03bd608e6a 100644
--- a/tests/acceptance/SubscriberManageImportExportCest.php
+++ b/tests/acceptance/SubscriberManageImportExportCest.php
@@ -54,7 +54,7 @@ class SubscriberManageImportExportCest {
     // trigger dropdown to display selections
     $I->click('input.select2-search__field');
     // choose first list
-    $I->click(['xpath'=>'//*[@id="select2-mailpoet_segments_select-results"]/li[1]']);
+    $I->click(['xpath' => '//*[@id="select2-mailpoet_segments_select-results"]/li[1]']);
     $I->click('#step_data_manipulation [data-automation-id="import-next-step"]');
     $I->waitForText('Import again');
   }
diff --git a/tests/acceptance/SubscriberManagementCest.php b/tests/acceptance/SubscriberManagementCest.php
index 3133a8433a..9b19c18905 100644
--- a/tests/acceptance/SubscriberManagementCest.php
+++ b/tests/acceptance/SubscriberManagementCest.php
@@ -68,7 +68,7 @@ class SubscriberManagementCest {
     $I->wantTo('Add a user to global subscribers list');
     $I->login();
     $I->amOnMailPoetPage ('Subscribers');
-    $I->click(['xpath'=>'//*[@id="subscribers_container"]/div/h1/a[1]']);
+    $I->click(['xpath' => '//*[@id="subscribers_container"]/div/h1/a[1]']);
     $I->fillField(['name' => 'email'], 'newglobaluser99@fakemail.fake');
     $I->fillField(['name' => 'first_name'], 'New');
     $I->fillField(['name' => 'last_name'], 'GlobalUser');
diff --git a/tests/integration/API/JSON/v1/SubscribersTest.php b/tests/integration/API/JSON/v1/SubscribersTest.php
index f0cf316524..e3c55b5969 100644
--- a/tests/integration/API/JSON/v1/SubscribersTest.php
+++ b/tests/integration/API/JSON/v1/SubscribersTest.php
@@ -248,7 +248,7 @@ class SubscribersTest extends \MailPoetTest {
   }
 
   function testItCanSearchListing() {
-    $new_subscriber =  Subscriber::createOrUpdate([
+    $new_subscriber = Subscriber::createOrUpdate([
       'email' => 'search.me@find.me',
       'first_name' => 'Billy Bob',
       'last_name' => 'Thornton',
@@ -376,7 +376,7 @@ class SubscribersTest extends \MailPoetTest {
   }
 
   function testItCanBulkDeleteSelectionOfSubscribers() {
-    $deletable_subscriber =  Subscriber::createOrUpdate([
+    $deletable_subscriber = Subscriber::createOrUpdate([
       'email' => 'to.be.removed@mailpoet.com',
     ]);
 
diff --git a/tests/integration/API/MP/APITest.php b/tests/integration/API/MP/APITest.php
index 148e9ccf06..4fb842e01a 100644
--- a/tests/integration/API/MP/APITest.php
+++ b/tests/integration/API/MP/APITest.php
@@ -429,7 +429,7 @@ class APITest extends \MailPoetTest {
       \MailPoet\API\MP\v1\API::class,
       'addSubscriber',
       [
-        'new_subscriber_notification_mailer'=> Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
+        'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
         'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
         '_scheduleWelcomeNotification' => Expected::once(),
       ], $this);
@@ -471,7 +471,7 @@ class APITest extends \MailPoetTest {
       'addSubscriber',
       [
         '_scheduleWelcomeNotification' => Expected::never(),
-        'new_subscriber_notification_mailer'=> Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
+        'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
         'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
       ], $this);
     $subscriber = [
@@ -487,7 +487,7 @@ class APITest extends \MailPoetTest {
       'addSubscriber',
       [
         '_scheduleWelcomeNotification' => Expected::never(),
-        'new_subscriber_notification_mailer'=> Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
+        'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
         'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
       ], $this);
     $subscriber = [
@@ -509,7 +509,7 @@ class APITest extends \MailPoetTest {
           expect($options['send_confirmation_email'])->equals(true);
         }),
         'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
-        'new_subscriber_notification_mailer'=> Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
+        'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
       ]
     );
     $subscriber = [
@@ -551,7 +551,7 @@ class APITest extends \MailPoetTest {
       [
         '__sendConfirmationEmail' => Expected::never(),
         'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
-        'new_subscriber_notification_mailer'=> Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
+        'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
       ], $this);
     $subscriber = [
       'email' => 'test@example.com',
diff --git a/tests/integration/Config/MP2MigratorTest.php b/tests/integration/Config/MP2MigratorTest.php
index e96cf47a37..76e254dfea 100644
--- a/tests/integration/Config/MP2MigratorTest.php
+++ b/tests/integration/Config/MP2MigratorTest.php
@@ -677,7 +677,7 @@ class MP2MigratorTest extends \MailPoetTest {
    *
    */
   private function loadMP2OptionsFixtures() {
-    $wysija_options =  [
+    $wysija_options = [
       'from_name' => 'Sender',
       'replyto_name' => 'Reply',
       'emails_notified' => 'notification@email.com',
diff --git a/tests/integration/Cron/Workers/ExportFilesCleanupTest.php b/tests/integration/Cron/Workers/ExportFilesCleanupTest.php
index 51af194886..6173fd3605 100644
--- a/tests/integration/Cron/Workers/ExportFilesCleanupTest.php
+++ b/tests/integration/Cron/Workers/ExportFilesCleanupTest.php
@@ -10,7 +10,7 @@ class ExportFilesCleanupTest extends \MailPoetTest {
     $wp_upload_dir = wp_upload_dir();
     $old_file_path = $wp_upload_dir['basedir'] . '/mailpoet/MailPoet_export_old_file.csv';
     $new_file_path = $wp_upload_dir['basedir'] . '/mailpoet/MailPoet_export_new_file.csv';
-    touch($old_file_path, time()  - (60 * 60 * 24 * 7));
+    touch($old_file_path, time() - (60 * 60 * 24 * 7));
     touch($new_file_path);
 
     $cleanup = new ExportFilesCleanup();
diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php
index fcf6805562..fa3961a4da 100644
--- a/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php
+++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php
@@ -304,7 +304,7 @@ class NewsletterTest extends \MailPoetTest {
   }
 
   function testItGetsSegments() {
-    for ($i = 1; $i<=3; $i++) {
+    for ($i = 1; $i <= 3; $i++) {
       $newsletter_segment = NewsletterSegment::create();
       $newsletter_segment->newsletter_id = $this->newsletter->id;
       $newsletter_segment->segment_id = $i;
diff --git a/tests/integration/Newsletter/Editor/PostContentTransformerTest.php b/tests/integration/Newsletter/Editor/PostContentTransformerTest.php
index a8d343fc5a..0cd3b590d3 100644
--- a/tests/integration/Newsletter/Editor/PostContentTransformerTest.php
+++ b/tests/integration/Newsletter/Editor/PostContentTransformerTest.php
@@ -31,7 +31,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldAddImageAboveTitleForExcerptWithoutLayout() {
-    $args =  [
+    $args = [
       'withLayout' => false,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'aboveTitle',
@@ -43,7 +43,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldAddImageBelowTitleForExcerptWithoutLayout() {
-    $args =  [
+    $args = [
       'withLayout' => false,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'belowTitle',
@@ -55,7 +55,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldTransformContentWithoutLayoutWhenImageIsMissing() {
-    $args =  [
+    $args = [
       'withLayout' => false,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'belowTitle',
@@ -67,7 +67,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldNotAddImageForTitleOnlyWhenImageIsPresentWithoutLayout() {
-    $args =  [
+    $args = [
       'withLayout' => false,
       'displayType' => 'titleOnly',
       'featuredImagePosition' => 'aboveTitle',
@@ -79,7 +79,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldPrependTitleTextToContentTextIfFirstContentBlockIsTextual() {
-    $args =  [
+    $args = [
       'withLayout' => false,
       'displayType' => 'titleOnly',
       'featuredImagePosition' => 'aboveTitle',
@@ -95,7 +95,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldCreateLayoutStructureForCenteredImageWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'centered',
@@ -116,7 +116,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldCreateLayoutStructureForCenteredImageWithLayoutWithTitleAboveExcerpt() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'centered',
@@ -133,7 +133,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldCreateLayoutStructureForOtherThanCenteredPositionedImageWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'alternate',
@@ -152,7 +152,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldAddCenteredImageForExcerptWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'centered',
@@ -164,7 +164,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldHandleOldStructureImagePositionValueAndAddImageForExcerptWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'aboveTitle',
@@ -176,7 +176,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldAddLeftPositionedImageForExcerptWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'left',
@@ -190,7 +190,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldAddLeftPositionedImageForExcerptWithTitleAboveExcerpt() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'left',
@@ -205,7 +205,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldAddRightPositionedImageForExcerptWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'right',
@@ -219,7 +219,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldNotAddImageForTitleOnlyWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'titleOnly',
       'featuredImagePosition' => 'centered',
@@ -231,7 +231,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldAddClassToParagraphsInFullPostsWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'full',
       'featuredImagePosition' => 'right',
@@ -249,7 +249,7 @@ class PostContentTransformerTest extends \MailPoetTest {
   }
 
   function testShouldNotAddClassToParagraphsInExcerptWithLayout() {
-    $args =  [
+    $args = [
       'withLayout' => true,
       'displayType' => 'excerpt',
       'featuredImagePosition' => 'right',
diff --git a/tests/integration/Segments/BulkActionTest.php b/tests/integration/Segments/BulkActionTest.php
index 8a3fd06146..097e2023c4 100644
--- a/tests/integration/Segments/BulkActionTest.php
+++ b/tests/integration/Segments/BulkActionTest.php
@@ -57,7 +57,7 @@ class BulkActionTest extends \MailPoetTest {
 
   function testBulkActionForDefaultSegment() {
     $handler = new BulkAction([
-      'listing' => ['filter'=> ['segment' => $this->segment_1->id]],
+      'listing' => ['filter' => ['segment' => $this->segment_1->id]],
       'action' => 'trash',
     ]);
     $result = $handler->apply();
@@ -66,7 +66,7 @@ class BulkActionTest extends \MailPoetTest {
 
   function testBulkActionForUnknownSegment() {
     $handler = new BulkAction([
-      'listing' => ['filter'=> ['segment' => 'this-segment-doesnt-exist']],
+      'listing' => ['filter' => ['segment' => 'this-segment-doesnt-exist']],
       'action' => 'trash',
     ]);
     $result = $handler->apply();
@@ -75,7 +75,7 @@ class BulkActionTest extends \MailPoetTest {
 
   function testForUnknownSegmentTypeWithoutHandler() {
     $handler = new BulkAction([
-      'listing' => ['filter'=> ['segment' => $this->segment_2->id]],
+      'listing' => ['filter' => ['segment' => $this->segment_2->id]],
       'action' => 'trash',
     ]);
     $this->setExpectedException('InvalidArgumentException');
@@ -96,7 +96,7 @@ class BulkActionTest extends \MailPoetTest {
     });
 
     $handler = new BulkAction([
-      'listing' => ['filter'=> ['segment' => $this->segment_2->id]],
+      'listing' => ['filter' => ['segment' => $this->segment_2->id]],
       'action' => 'trash',
     ]);
     $result = $handler->apply();
diff --git a/tests/integration/Segments/SubscribersListingsTest.php b/tests/integration/Segments/SubscribersListingsTest.php
index 5a0aa52851..6e998bc841 100644
--- a/tests/integration/Segments/SubscribersListingsTest.php
+++ b/tests/integration/Segments/SubscribersListingsTest.php
@@ -60,12 +60,12 @@ class SubscribersListingsTest extends \MailPoetTest {
   }
 
   function testGetListingsForDefaultSegment() {
-    $listings = $this->finder->getListingsInSegment(['filter'=> ['segment' => $this->segment_1->id]]);
+    $listings = $this->finder->getListingsInSegment(['filter' => ['segment' => $this->segment_1->id]]);
     expect($listings['items'])->count(1);
   }
 
   function testGetListingsForNonExistingSegmen() {
-    $listings = $this->finder->getListingsInSegment(['filter'=> ['segment' => 'non-existing-id']]);
+    $listings = $this->finder->getListingsInSegment(['filter' => ['segment' => 'non-existing-id']]);
     expect($listings['items'])->notEmpty();
   }
 
@@ -81,14 +81,14 @@ class SubscribersListingsTest extends \MailPoetTest {
       return [$mock];
     });
 
-    $listings = $this->finder->getListingsInSegment(['filter'=> ['segment' => $this->segment_2->id]]);
+    $listings = $this->finder->getListingsInSegment(['filter' => ['segment' => $this->segment_2->id]]);
     expect($listings)->equals('dynamic listings');
   }
 
   function testTryToGetListingsForSegmentWithoutHandler() {
     $this->setExpectedException('InvalidArgumentException');
     remove_all_filters('mailpoet_get_subscribers_listings_in_segment_handlers');
-    $this->finder->getListingsInSegment(['filter'=> ['segment' => $this->segment_2->id]]);
+    $this->finder->getListingsInSegment(['filter' => ['segment' => $this->segment_2->id]]);
   }
 
 }
diff --git a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php
index 3707d783ce..e3b221b3bc 100644
--- a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php
+++ b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php
@@ -59,12 +59,12 @@ class SegmentsExporterTest extends \MailPoetTest {
     expect($result)->internalType('array');
     expect($result)->hasKey('data');
     expect($result)->hasKey('done');
-    $expected =  [
+    $expected = [
        [
         'group_id' => 'mailpoet-lists',
         'group_label' => 'MailPoet Mailing Lists',
         'item_id' => 'list-' . $segment1->id(),
-        'data' =>  [
+        'data' => [
              ['name' => 'List name', 'value' => 'List 1'],
              ['name' => 'Subscription status', 'value' => 'subscribed'],
              ['name' => 'Timestamp of the subscription (or last change of the subscription status)', 'value' => '2018-05-02 15:26:52'],
@@ -74,7 +74,7 @@ class SegmentsExporterTest extends \MailPoetTest {
         'group_id' => 'mailpoet-lists',
         'group_label' => 'MailPoet Mailing Lists',
         'item_id' => 'list-' . $segment2->id(),
-        'data' =>  [
+        'data' => [
              ['name' => 'List name', 'value' => 'List 2'],
              ['name' => 'Subscription status', 'value' => 'unsubscribed'],
              ['name' => 'Timestamp of the subscription (or last change of the subscription status)', 'value' => '2018-05-02 15:26:00'],
diff --git a/tests/integration/Tasks/SendingTest.php b/tests/integration/Tasks/SendingTest.php
index 885d7745b2..be85e67a08 100644
--- a/tests/integration/Tasks/SendingTest.php
+++ b/tests/integration/Tasks/SendingTest.php
@@ -20,7 +20,7 @@ class SendingTest extends \MailPoetTest {
     ]);
     $this->sending = $this->createNewSendingTask([
       'status' => null,
-      'task' =>  $this->task,
+      'task' => $this->task,
       'queue' => $this->queue,
     ]);
   }