diff --git a/RoboFile.php b/RoboFile.php index 22f4497f3c..785e38e919 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -129,7 +129,7 @@ class RoboFile extends \Robo\Tasks { ->run(); } - public function testUnit(array $opts=['file' => null, 'xml' => false, 'multisite' => false, 'debug' => false]) { + public function testUnit(array $opts = ['file' => null, 'xml' => false, 'multisite' => false, 'debug' => false]) { $command = 'vendor/bin/codecept run unit'; if ($opts['file']) { @@ -147,7 +147,7 @@ class RoboFile extends \Robo\Tasks { return $this->_exec($command); } - public function testIntegration(array $opts=['file' => null, 'xml' => false, 'multisite' => false, 'debug' => false]) { + public function testIntegration(array $opts = ['file' => null, 'xml' => false, 'multisite' => false, 'debug' => false]) { if (getenv('MAILPOET_DEV_SITE')) { $run = $this->confirm("You are about to run tests on the development site. Your DB data will be erased. \nDo you want to proceed?", false); if (!$run) { @@ -175,11 +175,11 @@ class RoboFile extends \Robo\Tasks { return $this->_exec($command); } - public function testMultisiteIntegration($opts=['file' => null, 'xml' => false, 'multisite' => true]) { + public function testMultisiteIntegration($opts = ['file' => null, 'xml' => false, 'multisite' => true]) { return $this->testIntegration($opts); } - public function testCoverage($opts=['file' => null, 'xml' => false]) { + public function testCoverage($opts = ['file' => null, 'xml' => false]) { $command = join(' ', [ 'vendor/bin/codecept run -s acceptance', (($opts['file']) ? $opts['file'] : ''), @@ -230,15 +230,15 @@ class RoboFile extends \Robo\Tasks { return $this->_exec($command); } - public function testDebugUnit($opts=['file' => null, 'xml' => false, 'debug' => true]) { + public function testDebugUnit($opts = ['file' => null, 'xml' => false, 'debug' => true]) { return $this->testUnit($opts); } - public function testDebugIntegration($opts=['file' => null, 'xml' => false, 'debug' => true]) { + public function testDebugIntegration($opts = ['file' => null, 'xml' => false, 'debug' => true]) { return $this->testIntegration($opts); } - public function testAcceptance($opts=['file' => null, 'skip-deps' => false, 'timeout' => null]) { + public function testAcceptance($opts = ['file' => null, 'skip-deps' => false, 'timeout' => null]) { return $this->taskExec( 'COMPOSE_HTTP_TIMEOUT=200 docker-compose run ' . ($opts['skip-deps'] ? '-e SKIP_DEPS=1 ' : '') . @@ -248,7 +248,7 @@ class RoboFile extends \Robo\Tasks { )->dir(__DIR__ . '/tests/docker')->run(); } - public function testAcceptanceMultisite($opts=['file' => null, 'skip-deps' => false, 'timeout' => null]) { + public function testAcceptanceMultisite($opts = ['file' => null, 'skip-deps' => false, 'timeout' => null]) { return $this->taskExec( 'COMPOSE_HTTP_TIMEOUT=200 docker-compose run ' . ($opts['skip-deps'] ? '-e SKIP_DEPS=1 ' : '') . @@ -463,7 +463,7 @@ class RoboFile extends \Robo\Tasks { } } - public function qaPhpstan(array $opts=['php-version' => null]) { + public function qaPhpstan(array $opts = ['php-version' => null]) { $dir = __DIR__; $task = implode(' ', [ 'php -d memory_limit=-1', diff --git a/lib/API/JSON/API.php b/lib/API/JSON/API.php index 6d7d056a2c..fb615fd8f5 100644 --- a/lib/API/JSON/API.php +++ b/lib/API/JSON/API.php @@ -175,7 +175,8 @@ class API { public function processRoute() { try { - if (empty($this->requestEndpointClass) || + if ( + empty($this->requestEndpointClass) || !$this->container->has($this->requestEndpointClass) ) { throw new \Exception(__('Invalid API endpoint.', 'mailpoet')); diff --git a/lib/API/JSON/v1/Services.php b/lib/API/JSON/v1/Services.php index d3900ddd32..939783470d 100644 --- a/lib/API/JSON/v1/Services.php +++ b/lib/API/JSON/v1/Services.php @@ -130,7 +130,7 @@ class Services extends APIEndpoint { $code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN; $errorMessage = $this->wp->__('Error validating MailPoet Sending Service key, please try again later (%s).', 'mailpoet'); // If site runs on localhost - if ( 1 === preg_match("/^(http|https)\:\/\/(localhost|127\.0\.0\.1)/", $this->wp->siteUrl()) ) { + if (1 === preg_match("/^(http|https)\:\/\/(localhost|127\.0\.0\.1)/", $this->wp->siteUrl())) { $errorMessage .= ' ' . $this->wp->__("Note that it doesn't work on localhost.", 'mailpoet'); } $error = sprintf( diff --git a/lib/API/JSON/v1/Settings.php b/lib/API/JSON/v1/Settings.php index 489406304d..b851d91375 100644 --- a/lib/API/JSON/v1/Settings.php +++ b/lib/API/JSON/v1/Settings.php @@ -139,7 +139,7 @@ class Settings extends APIEndpoint { // Tracking and re-engagement Emails $meta['showNotice'] = false; - if ($oldSettings['tracking'] !== $this->settings->get('tracking') ) { + if ($oldSettings['tracking'] !== $this->settings->get('tracking')) { try { $meta = $this->updateReEngagementEmailStatus($this->settings->get('tracking')); } catch (\Exception $e) { diff --git a/lib/Analytics/Reporter.php b/lib/Analytics/Reporter.php index cb8da3425e..47cd0e94ab 100644 --- a/lib/Analytics/Reporter.php +++ b/lib/Analytics/Reporter.php @@ -80,7 +80,7 @@ class Reporter { } public function getData() { - global $wpdb, $wp_version, $woocommerce; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + global $wpdb, $wp_version, $woocommerce; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $mta = $this->settings->get('mta', []); $newsletters = $this->newslettersRepository->getAnalytics(); $isCronTriggerMethodWP = $this->settings->get('cron_trigger.method') === CronTrigger::METHOD_WORDPRESS; diff --git a/lib/AutomaticEmails/AutomaticEmails.php b/lib/AutomaticEmails/AutomaticEmails.php index 344947fb30..d60ce22fc3 100644 --- a/lib/AutomaticEmails/AutomaticEmails.php +++ b/lib/AutomaticEmails/AutomaticEmails.php @@ -45,7 +45,8 @@ class AutomaticEmails { foreach ($registeredGroups as $group) { $automaticEmail = $this->wp->applyFilters($group, []); - if (!$this->validateAutomaticEmailDataFields($automaticEmail) || + if ( + !$this->validateAutomaticEmailDataFields($automaticEmail) || !$this->validateAutomaticEmailEventsDataFields($automaticEmail['events']) ) { continue; diff --git a/lib/Config/Installer.php b/lib/Config/Installer.php index e5983f9c49..a36c70d194 100644 --- a/lib/Config/Installer.php +++ b/lib/Config/Installer.php @@ -28,7 +28,8 @@ class Installer { } public function getPluginInformation($data, $action = '', $args = null) { - if ($action === 'plugin_information' + if ( + $action === 'plugin_information' && isset($args->slug) && $args->slug === $this->slug ) { diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 69a240f3a7..c738df9064 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -499,7 +499,8 @@ class Menu { return false; } // Check if page already exists - if (get_plugin_page_hook($_REQUEST['page'], '') + if ( + get_plugin_page_hook($_REQUEST['page'], '') || WPFunctions::get()->getPluginPageHook($_REQUEST['page'], self::MAIN_PAGE_SLUG) ) { return false; diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php index 3af2aa334b..ec655d2d11 100644 --- a/lib/Config/Populator.php +++ b/lib/Config/Populator.php @@ -304,7 +304,7 @@ class Populator { 'enabled' => empty($settingsDbVersion), // enable on new installs only 'message' => $currentLabelText, ]); - } elseif (isset($woocommerceOptinOnCheckout['message']) && $woocommerceOptinOnCheckout['message'] === $legacyLabelText ) { + } elseif (isset($woocommerceOptinOnCheckout['message']) && $woocommerceOptinOnCheckout['message'] === $legacyLabelText) { $this->settings->set('woocommerce.optin_on_checkout.message', $currentLabelText); } // reset mailer log diff --git a/lib/Config/ServicesChecker.php b/lib/Config/ServicesChecker.php index c1262d985b..4bfad3de2a 100644 --- a/lib/Config/ServicesChecker.php +++ b/lib/Config/ServicesChecker.php @@ -33,7 +33,8 @@ class ServicesChecker { $mssKeySpecified = Bridge::isMSSKeySpecified(); $mssKey = $this->settings->get(Bridge::API_KEY_STATE_SETTING_NAME); - if (!$mssKeySpecified + if ( + !$mssKeySpecified || empty($mssKey['state']) || $mssKey['state'] == Bridge::KEY_INVALID ) { @@ -49,7 +50,8 @@ class ServicesChecker { WPNotice::displayError($error, '', '', false, false); } return false; - } elseif ($mssKey['state'] == Bridge::KEY_EXPIRING + } elseif ( + $mssKey['state'] == Bridge::KEY_EXPIRING && !empty($mssKey['data']['expire_at']) ) { if ($displayErrorNotice) { @@ -80,7 +82,8 @@ class ServicesChecker { $displayErrorNotice = false; } - if (!$premiumKeySpecified + if ( + !$premiumKeySpecified || empty($premiumKey['state']) || $premiumKey['state'] === Bridge::KEY_INVALID || $premiumKey['state'] === Bridge::KEY_ALREADY_USED @@ -102,7 +105,8 @@ class ServicesChecker { WPNotice::displayWarning($error); } return false; - } elseif ($premiumKey['state'] === Bridge::KEY_EXPIRING + } elseif ( + $premiumKey['state'] === Bridge::KEY_EXPIRING && !empty($premiumKey['data']['expire_at']) ) { if ($displayErrorNotice) { diff --git a/lib/Cron/DaemonHttpRunner.php b/lib/Cron/DaemonHttpRunner.php index 971eb34b09..9564c1ff5f 100644 --- a/lib/Cron/DaemonHttpRunner.php +++ b/lib/Cron/DaemonHttpRunner.php @@ -64,7 +64,8 @@ class DaemonHttpRunner { if (!$this->settingsDaemonData) { $error = WPFunctions::get()->__('Daemon does not exist.', 'mailpoet'); } else { - if (!isset($requestData['token']) || + if ( + !isset($requestData['token']) || $requestData['token'] !== $this->settingsDaemonData['token'] ) { $error = 'Invalid or missing token.'; @@ -81,7 +82,8 @@ class DaemonHttpRunner { $this->daemon->run($this->settingsDaemonData); // If we're using the WordPress trigger, check the conditions to stop cron if necessary $enableCronSelfDeactivation = WPFunctions::get()->applyFilters('mailpoet_cron_enable_self_deactivation', false); - if ($enableCronSelfDeactivation + if ( + $enableCronSelfDeactivation && $this->isCronTriggerMethodWordPress() && !$this->checkWPTriggerExecutionRequirements() ) { diff --git a/lib/Cron/Triggers/WordPress.php b/lib/Cron/Triggers/WordPress.php index d5c772d2bf..a2333aa7b4 100644 --- a/lib/Cron/Triggers/WordPress.php +++ b/lib/Cron/Triggers/WordPress.php @@ -338,7 +338,7 @@ class WordPress { $type = $options['type']; foreach ($options['scheduled_in'] as $scheduledIn) { foreach ($options['status'] as $status) { - if (! empty($this->tasksCounts[$type][$scheduledIn][$status])) { + if (!empty($this->tasksCounts[$type][$scheduledIn][$status])) { $count += $this->tasksCounts[$type][$scheduledIn][$status]; } } diff --git a/lib/Cron/Workers/Scheduler.php b/lib/Cron/Workers/Scheduler.php index 2a3f52b8b3..6d2203205b 100644 --- a/lib/Cron/Workers/Scheduler.php +++ b/lib/Cron/Workers/Scheduler.php @@ -221,7 +221,8 @@ class Scheduler { $queue->delete(); return false; } - if ($newsletter->role !== WelcomeScheduler::WORDPRESS_ALL_ROLES + if ( + $newsletter->role !== WelcomeScheduler::WORDPRESS_ALL_ROLES && !in_array($newsletter->role, ((array)$wpUser)['roles']) ) { $queue->delete(); diff --git a/lib/Cron/Workers/SendingQueue/Migration.php b/lib/Cron/Workers/SendingQueue/Migration.php index d9a72e3cb7..40bd9dfa77 100644 --- a/lib/Cron/Workers/SendingQueue/Migration.php +++ b/lib/Cron/Workers/SendingQueue/Migration.php @@ -30,7 +30,8 @@ class Migration extends SimpleWorker { $unmigratedQueueSubscribers = $this->getTaskIdsForUnmigratedSubscribers(); } - if (!$unmigratedColumns || + if ( + !$unmigratedColumns || ($unmigratedQueuesCount == 0 && count($unmigratedQueueSubscribers) == 0) ) { diff --git a/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php b/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php index 051679be93..2dff0c2532 100644 --- a/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php +++ b/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php @@ -147,7 +147,8 @@ class Newsletter { $renderedNewsletter = $this->gaTracking->applyGATracking($renderedNewsletter, $newsletter); } // check if this is a post notification and if it contains at least 1 ALC post - if ($newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY && + if ( + $newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY && $this->postsTask->getAlcPostsCount($renderedNewsletter, $newsletter) === 0 ) { // delete notification history record since it will never be sent @@ -232,7 +233,8 @@ class Newsletter { public function markNewsletterAsSent($newsletter, $queue) { // if it's a standard or notification history newsletter, update its status - if ($newsletter->type === NewsletterModel::TYPE_STANDARD || + if ( + $newsletter->type === NewsletterModel::TYPE_STANDARD || $newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY ) { $newsletter->status = NewsletterModel::STATUS_SENT; diff --git a/lib/Entities/SubscriberEntity.php b/lib/Entities/SubscriberEntity.php index 9e0307ec74..c518bf99ac 100644 --- a/lib/Entities/SubscriberEntity.php +++ b/lib/Entities/SubscriberEntity.php @@ -257,13 +257,15 @@ class SubscriberEntity { * @param string $status */ public function setStatus($status) { - if (!in_array($status, [ - self::STATUS_BOUNCED, - self::STATUS_INACTIVE, - self::STATUS_SUBSCRIBED, - self::STATUS_UNCONFIRMED, - self::STATUS_UNSUBSCRIBED, - ])) { + if ( + !in_array($status, [ + self::STATUS_BOUNCED, + self::STATUS_INACTIVE, + self::STATUS_SUBSCRIBED, + self::STATUS_UNCONFIRMED, + self::STATUS_UNSUBSCRIBED, + ]) + ) { throw new \InvalidArgumentException("Invalid status '{$status}' given to subscriber!"); } $this->status = $status; @@ -350,16 +352,18 @@ class SubscriberEntity { * @param string $source */ public function setSource($source) { - if (!in_array($source, [ - 'api', - 'form', - 'unknown', - 'imported', - 'administrator', - 'wordpress_user', - 'woocommerce_user', - 'woocommerce_checkout', - ])) { + if ( + !in_array($source, [ + 'api', + 'form', + 'unknown', + 'imported', + 'administrator', + 'wordpress_user', + 'woocommerce_user', + 'woocommerce_checkout', + ]) + ) { throw new \InvalidArgumentException("Invalid source '{$source}' given to subscriber!"); } $this->source = $source; diff --git a/lib/Form/Block/BlockRendererHelper.php b/lib/Form/Block/BlockRendererHelper.php index 623076b95f..2aaa103be1 100644 --- a/lib/Form/Block/BlockRendererHelper.php +++ b/lib/Form/Block/BlockRendererHelper.php @@ -119,8 +119,10 @@ class BlockRendererHelper { if (in_array($block['id'], ['email', 'last_name', 'first_name'], true)) { $automationId = 'data-automation-id="form_' . $block['id'] . '_label" '; } - if (isset($block['params']['label']) - && strlen(trim($block['params']['label'])) > 0) { + if ( + isset($block['params']['label']) + && strlen(trim($block['params']['label'])) > 0 + ) { $html .= '