diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c9cb28b884..fdd0ca46fe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ - we want to avoid using `eslint-disable` - if we have to use it we need to use a comment explaining why do we need it: `/* eslint-disable no-new -- this class has a side-effect in the constructor and it's a library's. */` -- for PHP we do the same with the exception `// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps` which for now doesn’t require an explanation +- for PHP we do the same with the exception `// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps` which for now doesn’t require an explanation ## Git flow - Do not commit to master. diff --git a/lib/AdminPages/Pages/Newsletters.php b/lib/AdminPages/Pages/Newsletters.php index a9c97c43c7..595078b567 100644 --- a/lib/AdminPages/Pages/Newsletters.php +++ b/lib/AdminPages/Pages/Newsletters.php @@ -101,7 +101,7 @@ class Newsletters { } public function render() { - global $wp_roles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_roles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $data = []; @@ -115,7 +115,7 @@ class Newsletters { $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(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $data['roles'] = $wp_roles->get_names(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $data['roles']['mailpoet_all'] = $this->wp->__('In any WordPress role', 'mailpoet'); $installedAtDiff = (new \DateTime($this->settings->get('installed_at')))->diff(new \DateTime()); diff --git a/lib/AdminPages/Pages/Settings.php b/lib/AdminPages/Pages/Settings.php index c9ca4e68d7..ed4fc00ea1 100644 --- a/lib/AdminPages/Pages/Settings.php +++ b/lib/AdminPages/Pages/Settings.php @@ -78,7 +78,7 @@ class Settings { 'current_user' => $this->wp->wpGetCurrentUser(), 'is_woocommerce_active' => $this->woocommerceHelper->isWooCommerceActive(), 'is_members_plugin_active' => $this->wp->isPluginActive('members/members.php'), - 'premium_plugin_download_url' => $pluginInformation->download_link ?? null, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'premium_plugin_download_url' => $pluginInformation->download_link ?? null, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'hosts' => [ 'web' => Hosts::getWebHosts(), 'smtp' => Hosts::getSMTPHosts(), diff --git a/lib/Analytics/Reporter.php b/lib/Analytics/Reporter.php index fd6a4a2ddf..d287f110e7 100644 --- a/lib/Analytics/Reporter.php +++ b/lib/Analytics/Reporter.php @@ -55,7 +55,7 @@ class Reporter { } public function getData() { - global $wpdb, $wp_version, $woocommerce; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 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; @@ -68,7 +68,7 @@ class Reporter { $result = [ 'PHP version' => PHP_VERSION, 'MySQL version' => $wpdb->db_version(), - 'WordPress version' => $wp_version, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'WordPress version' => $wp_version, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'Multisite environment' => $this->wp->isMultisite() ? 'yes' : 'no', 'RTL' => $this->wp->isRtl() ? 'yes' : 'no', 'WP_MEMORY_LIMIT' => WP_MEMORY_LIMIT, diff --git a/lib/AutomaticEmails/AutomaticEmails.php b/lib/AutomaticEmails/AutomaticEmails.php index 5be925085b..68f86a6363 100644 --- a/lib/AutomaticEmails/AutomaticEmails.php +++ b/lib/AutomaticEmails/AutomaticEmails.php @@ -46,13 +46,13 @@ class AutomaticEmails { } public function getAutomaticEmails() { - global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if ($this->automaticEmails) { return $this->automaticEmails; } - // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $registeredGroups = preg_grep('!^' . self::FILTER_PREFIX . '(.*?)$!', array_keys($wp_filter)); if (empty($registeredGroups)) return null; @@ -134,9 +134,9 @@ class AutomaticEmails { } public function unregisterAutomaticEmails() { - global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps - // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $registeredGroups = preg_grep('!^' . self::FILTER_PREFIX . '(.*?)$!', array_keys($wp_filter)); if (empty($registeredGroups)) return null; diff --git a/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php b/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php index b2e067d4b3..e71562e2e3 100644 --- a/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php +++ b/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php @@ -82,7 +82,7 @@ class PurchasedInCategory { return array_map(function($category) { return [ - 'id' => $category->term_id, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'id' => $category->term_id, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'name' => $category->name, ]; }, $allCategories); diff --git a/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php b/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php index 3cdf55a1ce..6d7a0b803b 100644 --- a/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php +++ b/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php @@ -94,7 +94,7 @@ class PurchasedProduct { $woocommerceProducts = array_map(function($product) { return [ 'id' => $product->ID, - 'name' => $product->post_title, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'name' => $product->post_title, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ]; }, $woocommerceProducts); return $woocommerceProducts; diff --git a/lib/Config/Env.php b/lib/Config/Env.php index 98dc25ee01..7284ca6732 100644 --- a/lib/Config/Env.php +++ b/lib/Config/Env.php @@ -62,8 +62,8 @@ class Env { self::initDbParameters($dbHost, $dbUser, $dbPassword, $dbName); // back compatibility for older Premium plugin with underscore naming - self::$plugin_name = self::$pluginName; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - self::$temp_path = self::$tempPath; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + self::$plugin_name = self::$pluginName; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + self::$temp_path = self::$tempPath; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } /** diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php index 0f3d74366b..fb256e85a3 100644 --- a/lib/Config/Populator.php +++ b/lib/Config/Populator.php @@ -228,8 +228,8 @@ class Populator { // set default sender info based on current user $sender = [ - 'name' => $currentUser->display_name, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - 'address' => $currentUser->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'name' => $currentUser->display_name, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + 'address' => $currentUser->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ]; // set default from name & address diff --git a/lib/Config/Updater.php b/lib/Config/Updater.php index deb1b45e78..dbae3a5b46 100644 --- a/lib/Config/Updater.php +++ b/lib/Config/Updater.php @@ -33,11 +33,11 @@ class Updater { $latestVersion = $this->getLatestVersion(); - if (isset($latestVersion->new_version)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - if (version_compare($this->version, $latestVersion->new_version, '<')) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (isset($latestVersion->new_version)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + if (version_compare($this->version, $latestVersion->new_version, '<')) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $updateTransient->response[$this->plugin] = $latestVersion; } - $updateTransient->last_checked = time(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $updateTransient->last_checked = time(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $updateTransient->checked[$this->plugin] = $this->version; } diff --git a/lib/Cron/Workers/SendingQueue/Migration.php b/lib/Cron/Workers/SendingQueue/Migration.php index effb3e2147..2cb86ecfce 100644 --- a/lib/Cron/Workers/SendingQueue/Migration.php +++ b/lib/Cron/Workers/SendingQueue/Migration.php @@ -142,7 +142,7 @@ class Migration extends SimpleWorker { $queue['id'] )); // link the queue with the task via task_id - $newTaskId = $wpdb->insert_id; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $newTaskId = $wpdb->insert_id; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $wpdb->query(sprintf( 'UPDATE %1$s SET `task_id` = %2$s WHERE `id` = %3$s', MP_SENDING_QUEUES_TABLE, diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php index d628beed95..2d5b70513c 100644 --- a/lib/Form/Widget.php +++ b/lib/Form/Widget.php @@ -190,7 +190,7 @@ class Widget extends \WP_Widget { 'widget_title', !empty($instance['title']) ? $instance['title'] : '', $instance, - $this->id_base // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $this->id_base // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ); // get form @@ -216,7 +216,7 @@ class Widget extends \WP_Widget { $output = ''; if (!empty($body) && isset($form['settings']) && is_array($form['settings'])) { - $formId = $this->id_base . '_' . $form['id']; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $formId = $this->id_base . '_' . $form['id']; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $data = [ 'form_html_id' => $formId, 'form_id' => $form['id'], diff --git a/lib/Helpscout/Beacon.php b/lib/Helpscout/Beacon.php index 1e39428a7b..7ca2fe8c50 100644 --- a/lib/Helpscout/Beacon.php +++ b/lib/Helpscout/Beacon.php @@ -39,7 +39,7 @@ class Beacon { CronDaemon::ACTION_PING ); return [ - 'name' => $currentUser->display_name, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'name' => $currentUser->display_name, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'email' => $sender['address'], 'PHP version' => PHP_VERSION, 'MailPoet Free version' => MAILPOET_VERSION, diff --git a/lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php b/lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php index b5fed96196..a9ddd1e4cd 100644 --- a/lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php +++ b/lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php @@ -29,11 +29,11 @@ class AmazonSESMapper { */ public function getErrorFromResponse($response, $subscriber) { $message = ($response) ? - $response->Error->Message->__toString() : // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $response->Error->Message->__toString() : // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps sprintf(WPFunctions::get()->__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_AMAZONSES); $level = MailerError::LEVEL_HARD; - if ($response && $response->Error->Code->__toString() === 'MessageRejected') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if ($response && $response->Error->Code->__toString() === 'MessageRejected') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $level = MailerError::LEVEL_SOFT; } $subscriberErrors = [new SubscriberError($subscriber, null)]; diff --git a/lib/Mailer/Methods/PHPMail.php b/lib/Mailer/Methods/PHPMail.php index 8d2947df3e..d7556f6777 100644 --- a/lib/Mailer/Methods/PHPMail.php +++ b/lib/Mailer/Methods/PHPMail.php @@ -63,17 +63,17 @@ class PHPMail { $mailer->clearAddresses(); $mailer->clearCustomHeaders(); $mailer->isHTML(!empty($newsletter['body']['html'])); - $mailer->CharSet = 'UTF-8'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $mailer->CharSet = 'UTF-8'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $mailer->setFrom($this->sender['from_email'], $this->sender['from_name'], false); $mailer->addReplyTo($this->replyTo['reply_to_email'], $this->replyTo['reply_to_name']); $subscriber = $this->processSubscriber($subscriber); $mailer->addAddress($subscriber['email'], $subscriber['name']); - $mailer->Subject = (!empty($newsletter['subject'])) ? $newsletter['subject'] : ''; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $mailer->Body = (!empty($newsletter['body']['html'])) ? $newsletter['body']['html'] : $newsletter['body']['text']; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - if ($mailer->ContentType !== 'text/plain') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $mailer->AltBody = (!empty($newsletter['body']['text'])) ? $newsletter['body']['text'] : ''; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $mailer->Subject = (!empty($newsletter['subject'])) ? $newsletter['subject'] : ''; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $mailer->Body = (!empty($newsletter['body']['html'])) ? $newsletter['body']['html'] : $newsletter['body']['text']; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + if ($mailer->ContentType !== 'text/plain') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $mailer->AltBody = (!empty($newsletter['body']['text'])) ? $newsletter['body']['text'] : ''; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } - $mailer->Sender = $this->returnPath; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $mailer->Sender = $this->returnPath; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if (!empty($extraParams['unsubscribe_url'])) { $this->mailer->addCustomHeader('List-Unsubscribe', $extraParams['unsubscribe_url']); } @@ -85,8 +85,8 @@ class PHPMail { // sendmail command which expects only NL as line endings (POSIX). Since quoted-printable // requires CRLF some of those commands convert LF to CRLF which can break the email body // because it already (correctly) uses CRLF. Such CRLF then (wrongly) becomes CRCRLF. - if (\PHPMailer::hasLineLongerThanMax($mailer->Body)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $mailer->Encoding = 'base64'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (\PHPMailer::hasLineLongerThanMax($mailer->Body)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $mailer->Encoding = 'base64'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } return $mailer; diff --git a/lib/Mailer/WordPress/WordPressMailer.php b/lib/Mailer/WordPress/WordPressMailer.php index be43e3e72b..113a3da671 100644 --- a/lib/Mailer/WordPress/WordPressMailer.php +++ b/lib/Mailer/WordPress/WordPressMailer.php @@ -38,7 +38,7 @@ class WordPressMailer extends \PHPMailer { public function send() { // We need this so that the \PHPMailer class will correctly prepare all the headers. - $this->Mailer = 'mail'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $this->Mailer = 'mail'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps // Prepare everything (including the message) for sending. $this->preSend(); @@ -71,7 +71,7 @@ class WordPressMailer extends \PHPMailer { } private function getEmail() { - // phpcs:disable Squiz.NamingConventions.ValidVariableName.NotCamelCaps + // phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $email = [ 'subject' => $this->Subject, 'body' => [], diff --git a/lib/Newsletter/AutomatedLatestContent.php b/lib/Newsletter/AutomatedLatestContent.php index d06349a9f0..9f17fc8c32 100644 --- a/lib/Newsletter/AutomatedLatestContent.php +++ b/lib/Newsletter/AutomatedLatestContent.php @@ -43,8 +43,8 @@ class AutomatedLatestContent { // Queries with taxonomies are autodetected as 'is_archive=true' and 'is_home=false' // while queries without them end up being 'is_archive=false' and 'is_home=true'. // This is to fix that by always enforcing constistent behavior. - $query->is_archive = true; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $query->is_home = false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $query->is_archive = true; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $query->is_home = false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function getPosts($args, $postsToExclude = [], $newsletterId = false, $newerThanTimestamp = false) { @@ -179,7 +179,7 @@ class AutomatedLatestContent { foreach ($posts as $post) { $postsToLog[] = [ 'id' => $post->ID, - 'post_date' => $post->post_date, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'post_date' => $post->post_date, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ]; } $this->loggerFactory->getLogger(LoggerFactory::TOPIC_POST_NOTIFICATIONS)->addInfo( diff --git a/lib/Newsletter/Editor/MetaInformationManager.php b/lib/Newsletter/Editor/MetaInformationManager.php index 08d4dcd448..2d8209ed98 100644 --- a/lib/Newsletter/Editor/MetaInformationManager.php +++ b/lib/Newsletter/Editor/MetaInformationManager.php @@ -13,7 +13,7 @@ class MetaInformationManager { if (isset($args['showAuthor']) && $args['showAuthor'] === $positionField) { $text[] = self::getPostAuthor( - $post->post_author, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $post->post_author, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $args['authorPrecededBy'] ); } @@ -21,7 +21,7 @@ class MetaInformationManager { if (isset($args['showCategories']) && $args['showCategories'] === $positionField) { $text[] = self::getPostCategories( $post->ID, - $post->post_type, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $post->post_type, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $args['categoriesPrecededBy'] ); } diff --git a/lib/Newsletter/Editor/PostContentManager.php b/lib/Newsletter/Editor/PostContentManager.php index 47bdd7d0eb..73ffde346b 100644 --- a/lib/Newsletter/Editor/PostContentManager.php +++ b/lib/Newsletter/Editor/PostContentManager.php @@ -23,19 +23,19 @@ class PostContentManager { if ($displayType === 'titleOnly') { return ''; } - if ($this->woocommerceHelper->isWooCommerceActive() && $post->post_type === 'product') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if ($this->woocommerceHelper->isWooCommerceActive() && $post->post_type === 'product') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $product = $this->woocommerceHelper->wcGetProduct($post->ID); if ($product) { return $this->getContentForProduct($product, $displayType); } } if ($displayType === 'excerpt') { - if (!empty($post->post_excerpt)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - return self::stripShortCodes($post->post_excerpt); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (!empty($post->post_excerpt)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + return self::stripShortCodes($post->post_excerpt); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } - return $this->generateExcerpt($post->post_content); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + return $this->generateExcerpt($post->post_content); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } - return self::stripShortCodes($post->post_content); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + return self::stripShortCodes($post->post_content); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function filterContent($content, $displayType, $withPostClass = true) { diff --git a/lib/Newsletter/Editor/PostTransformerContentsExtractor.php b/lib/Newsletter/Editor/PostTransformerContentsExtractor.php index f1046b1e8d..4726e2040e 100644 --- a/lib/Newsletter/Editor/PostTransformerContentsExtractor.php +++ b/lib/Newsletter/Editor/PostTransformerContentsExtractor.php @@ -58,19 +58,19 @@ class PostTransformerContentsExtractor { * * https://mailpoet.atlassian.net/browse/MAILPOET-1365 */ - global $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps, default is NULL + global $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps, default is NULL - $contentWidthCopy = $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $content_width = Env::NEWSLETTER_CONTENT_WIDTH; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $contentWidthCopy = $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $content_width = Env::NEWSLETTER_CONTENT_WIDTH; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $imageInfo = $this->wp->wpGetAttachmentImageSrc($id, 'mailpoet_newsletter_max'); - $content_width = $contentWidthCopy; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $content_width = $contentWidthCopy; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps return $imageInfo; } public function getFeaturedImage($post) { $postId = $post->ID; - $postTitle = $this->sanitizeTitle($post->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $postTitle = $this->sanitizeTitle($post->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $imageFullWidth = (bool)filter_var($this->args['imageFullWidth'], FILTER_VALIDATE_BOOLEAN); if (!has_post_thumbnail($postId)) { @@ -131,7 +131,7 @@ class PostTransformerContentsExtractor { } public function getTitle($post) { - $title = $this->sanitizeTitle($post->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $title = $this->sanitizeTitle($post->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if (filter_var($this->args['titleIsLink'], FILTER_VALIDATE_BOOLEAN)) { $title = '' . $title . ''; @@ -188,7 +188,7 @@ class PostTransformerContentsExtractor { } public function isProduct($post) { - return $post->post_type === 'product'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + return $post->post_type === 'product'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } /** diff --git a/lib/Newsletter/Editor/TitleListTransformer.php b/lib/Newsletter/Editor/TitleListTransformer.php index 1369f0eb39..0ddbdc9e24 100644 --- a/lib/Newsletter/Editor/TitleListTransformer.php +++ b/lib/Newsletter/Editor/TitleListTransformer.php @@ -31,7 +31,7 @@ class TitleListTransformer { } private function getPostTitle($post) { - $title = $post->post_title; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $title = $post->post_title; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $alignment = $this->args['titleAlignment']; $alignment = (in_array($alignment, ['left', 'right', 'center'])) ? $alignment : 'left'; diff --git a/lib/Newsletter/Scheduler/PostNotificationScheduler.php b/lib/Newsletter/Scheduler/PostNotificationScheduler.php index ff8ffb2b08..159ee71337 100644 --- a/lib/Newsletter/Scheduler/PostNotificationScheduler.php +++ b/lib/Newsletter/Scheduler/PostNotificationScheduler.php @@ -63,7 +63,7 @@ class PostNotificationScheduler { ] ); $types = Posts::getTypes(); - if (($newStatus !== 'publish') || !isset($types[$post->post_type])) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (($newStatus !== 'publish') || !isset($types[$post->post_type])) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps return; } $this->schedulePostNotification($post->ID); @@ -112,7 +112,7 @@ class PostNotificationScheduler { if ($scheduledAt && $scheduledAt->format('Y-m-d H:i:s') === $nextRunDate) { return null; } - + $sendingTask = SendingTask::create(); $sendingTask->newsletterId = $newsletter->getId(); $sendingTask->status = SendingQueue::STATUS_SCHEDULED; diff --git a/lib/Newsletter/Shortcodes/Categories/Newsletter.php b/lib/Newsletter/Shortcodes/Categories/Newsletter.php index bc812a4597..db5d4c348e 100644 --- a/lib/Newsletter/Shortcodes/Categories/Newsletter.php +++ b/lib/Newsletter/Shortcodes/Categories/Newsletter.php @@ -58,8 +58,8 @@ class Newsletter implements CategoryInterface { // Queries with taxonomies are autodetected as 'is_archive=true' and 'is_home=false' // while queries without them end up being 'is_archive=false' and 'is_home=true'. // This is to fix that by always enforcing constistent behavior. - $query->is_archive = true; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $query->is_home = false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $query->is_archive = true; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $query->is_home = false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } private function getLatestWPPost($postIds) { diff --git a/lib/Newsletter/Shortcodes/Categories/Subscriber.php b/lib/Newsletter/Shortcodes/Categories/Subscriber.php index 31282b2bdd..6cd64b204f 100644 --- a/lib/Newsletter/Shortcodes/Categories/Subscriber.php +++ b/lib/Newsletter/Shortcodes/Categories/Subscriber.php @@ -50,7 +50,7 @@ class Subscriber implements CategoryInterface { case 'displayname': if ($subscriber->getWpUserId()) { $wpUser = WPFunctions::get()->getUserdata($subscriber->getWpUserId()); - return $wpUser->user_login; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + return $wpUser->user_login; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } return $defaultValue; case 'count': diff --git a/lib/Router/Endpoints/Track.php b/lib/Router/Endpoints/Track.php index 77801be810..068f3e4283 100644 --- a/lib/Router/Endpoints/Track.php +++ b/lib/Router/Endpoints/Track.php @@ -80,22 +80,22 @@ class Track { public function _processTrackData($data) { $data = (object)$this->links->transformUrlDataObject($data); - if (empty($data->queue_id) || // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - empty($data->subscriber_id) || // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - empty($data->subscriber_token) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (empty($data->queue_id) || // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + empty($data->subscriber_id) || // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + empty($data->subscriber_token) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ) { return false; } - $data->queue = $this->sendingQueuesRepository->findOneById($data->queue_id);// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $data->subscriber = $this->subscribersRepository->findOneById($data->subscriber_id); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $data->newsletter = (isset($data->newsletter_id)) ? $this->newslettersRepository->findOneById($data->newsletter_id) : null; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $data->queue = $this->sendingQueuesRepository->findOneById($data->queue_id);// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $data->subscriber = $this->subscribersRepository->findOneById($data->subscriber_id); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $data->newsletter = (isset($data->newsletter_id)) ? $this->newslettersRepository->findOneById($data->newsletter_id) : null; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if (!$data->newsletter && ($data->queue instanceof SendingQueueEntity)) { $data->newsletter = $data->queue->getNewsletter(); } - if (!empty($data->link_hash)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (!empty($data->link_hash)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $data->link = $this->newsletterLinkRepository->findOneBy([ - 'hash' => $data->link_hash, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - 'queue' => $data->queue_id, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'hash' => $data->link_hash, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + 'queue' => $data->queue_id, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ]); } return $this->_validateTrackData($data); @@ -103,7 +103,7 @@ class Track { public function _validateTrackData($data) { if (!$data->subscriber || !$data->queue || !$data->newsletter) return false; - $subscriberTokenMatch = $this->linkTokens->verifyToken($data->subscriber, $data->subscriber_token); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $subscriberTokenMatch = $this->linkTokens->verifyToken($data->subscriber, $data->subscriber_token); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if (!$subscriberTokenMatch) { $this->terminate(403); } diff --git a/lib/Router/Endpoints/ViewInBrowser.php b/lib/Router/Endpoints/ViewInBrowser.php index 2e87839a66..4956f204b0 100644 --- a/lib/Router/Endpoints/ViewInBrowser.php +++ b/lib/Router/Endpoints/ViewInBrowser.php @@ -38,9 +38,9 @@ class ViewInBrowser { } private function abort() { - global $wp_query;// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_query;// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps WPFunctions::get()->statusHeader(404); - $wp_query->set_404();// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wp_query->set_404();// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps exit; } } diff --git a/lib/Segments/DynamicSegments/Filters/WooCommerceCategory.php b/lib/Segments/DynamicSegments/Filters/WooCommerceCategory.php index e1851f19e8..184f2b9106 100644 --- a/lib/Segments/DynamicSegments/Filters/WooCommerceCategory.php +++ b/lib/Segments/DynamicSegments/Filters/WooCommerceCategory.php @@ -49,12 +49,12 @@ class WooCommerceCategory implements Filter { "itemmeta.order_item_id = items.order_item_id AND itemmeta.meta_key = '_product_id'" )->join( 'itemmeta', - $wpdb->term_relationships, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wpdb->term_relationships, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'term_relationships', 'itemmeta.meta_value = term_relationships.object_id' )->innerJoin( 'term_relationships', - $wpdb->term_taxonomy, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wpdb->term_taxonomy, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'term_taxonomy', 'term_taxonomy.term_taxonomy_id=term_relationships.term_taxonomy_id AND @@ -69,7 +69,7 @@ class WooCommerceCategory implements Filter { $subcategories = $this->wp->getTerms('product_cat', ['child_of' => $categoryId]); if (!is_array($subcategories)) return []; $ids = array_map(function($category) { - return $category->term_id; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + return $category->term_id; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps }, $subcategories); $ids[] = $categoryId; return $ids; diff --git a/lib/Segments/WP.php b/lib/Segments/WP.php index d4c152cecb..742457b370 100644 --- a/lib/Segments/WP.php +++ b/lib/Segments/WP.php @@ -60,13 +60,13 @@ class WP { // find subscriber by email when is false if (!$subscriber) { - $subscriber = Subscriber::where('email', $wpUser->user_email)->findOne(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $subscriber = Subscriber::where('email', $wpUser->user_email)->findOne(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } // get first name & last name - $firstName = $wpUser->first_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $lastName = $wpUser->last_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - if (empty($wpUser->first_name) && empty($wpUser->last_name)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $firstName = $wpUser->display_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $firstName = $wpUser->first_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $lastName = $wpUser->last_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + if (empty($wpUser->first_name) && empty($wpUser->last_name)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $firstName = $wpUser->display_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } $signupConfirmationEnabled = SettingsController::getInstance()->get('signup_confirmation.enabled'); $status = $signupConfirmationEnabled ? Subscriber::STATUS_UNCONFIRMED : Subscriber::STATUS_SUBSCRIBED; @@ -77,7 +77,7 @@ class WP { // subscriber data $data = [ 'wp_user_id' => $wpUser->ID, - 'email' => $wpUser->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $wpUser->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'first_name' => $firstName, 'last_name' => $lastName, 'status' => $status, diff --git a/lib/Segments/WooCommerce.php b/lib/Segments/WooCommerce.php index fd6387addb..dc601dca41 100644 --- a/lib/Segments/WooCommerce.php +++ b/lib/Segments/WooCommerce.php @@ -93,11 +93,11 @@ class WooCommerce { $data['source'] = Source::WOOCOMMERCE_USER; } $data['id'] = $subscriber->id(); - if ($wpUser->first_name) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $data['first_name'] = $wpUser->first_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if ($wpUser->first_name) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $data['first_name'] = $wpUser->first_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } - if ($wpUser->last_name) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $data['last_name'] = $wpUser->last_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if ($wpUser->last_name) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $data['last_name'] = $wpUser->last_name; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } $subscriber = Subscriber::createOrUpdate($data); if ($subscriber->getErrors() === false && $subscriber->id > 0) { @@ -133,8 +133,8 @@ class WooCommerce { ->findOne(); if ($subscriber !== false) { - $firstName = $wcOrder->get_billing_first_name(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $lastName = $wcOrder->get_billing_last_name(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $firstName = $wcOrder->get_billing_first_name(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $lastName = $wcOrder->get_billing_last_name(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if ($firstName) { $subscriber->firstName = $firstName; } @@ -178,11 +178,11 @@ class WooCommerce { $mailpoetEmailColumn = $wpdb->get_row( 'SHOW FULL COLUMNS FROM ' . MP_SUBSCRIBERS_TABLE . ' WHERE Field = "email"' ); - $this->mailpoetEmailCollation = $mailpoetEmailColumn->Collation; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $this->mailpoetEmailCollation = $mailpoetEmailColumn->Collation; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $wpPostmetaValueColumn = $wpdb->get_row( 'SHOW FULL COLUMNS FROM ' . $wpdb->postmeta . ' WHERE Field = "meta_value"' ); - $this->wpPostmetaValueCollation = $wpPostmetaValueColumn->Collation; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $this->wpPostmetaValueCollation = $wpPostmetaValueColumn->Collation; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } private function needsCollationChange(): bool { diff --git a/lib/Settings/Pages.php b/lib/Settings/Pages.php index 22b0cc0d06..4a63458932 100644 --- a/lib/Settings/Pages.php +++ b/lib/Settings/Pages.php @@ -56,7 +56,7 @@ class Pages { $page = null; if (!empty($pages)) { $page = array_shift($pages); - if (strpos($page->post_content, '[mailpoet_page]') === false) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (strpos($page->post_content, '[mailpoet_page]') === false) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $page = null; } } @@ -102,7 +102,7 @@ class Pages { $subscriptionUrlFactory = Subscription\SubscriptionUrlFactory::getInstance(); return [ 'id' => $page->ID, - 'title' => $page->post_title, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'title' => $page->post_title, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'url' => [ 'unsubscribe' => $subscriptionUrlFactory->getSubscriptionUrl($page, 'unsubscribe'), 'manage' => $subscriptionUrlFactory->getSubscriptionUrl($page, 'manage'), diff --git a/lib/Statistics/Track/Clicks.php b/lib/Statistics/Track/Clicks.php index a1180f0b52..7d3373dc8e 100644 --- a/lib/Statistics/Track/Clicks.php +++ b/lib/Statistics/Track/Clicks.php @@ -142,9 +142,9 @@ class Clicks { } public function abort() { - global $wp_query;// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_query;// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps WPFunctions::get()->statusHeader(404); - $wp_query->set_404();// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wp_query->set_404();// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps WPFunctions::get()->getTemplatePart((string)404); exit; } diff --git a/lib/Subscribers/SubscriberSaveController.php b/lib/Subscribers/SubscriberSaveController.php index 977f97976d..4bc9170b35 100644 --- a/lib/Subscribers/SubscriberSaveController.php +++ b/lib/Subscribers/SubscriberSaveController.php @@ -93,7 +93,7 @@ class SubscriberSaveController { (int)$oldSubscriber->getId(), StatisticsUnsubscribeEntity::SOURCE_ADMINISTRATOR, null, - $currentUser->display_name // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $currentUser->display_name // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ); } diff --git a/lib/Subscription/Comment.php b/lib/Subscription/Comment.php index 5296c4551c..339ead90d4 100644 --- a/lib/Subscription/Comment.php +++ b/lib/Subscription/Comment.php @@ -101,8 +101,8 @@ class Comment { $result = $this->subscriberActions->subscribe( [ - 'email' => $comment->comment_author_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - 'first_name' => $comment->comment_author, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $comment->comment_author_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + 'first_name' => $comment->comment_author, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ], $segmentIds ); diff --git a/lib/Subscription/ManageSubscriptionFormRenderer.php b/lib/Subscription/ManageSubscriptionFormRenderer.php index 665e4215b5..963aa88b2c 100644 --- a/lib/Subscription/ManageSubscriptionFormRenderer.php +++ b/lib/Subscription/ManageSubscriptionFormRenderer.php @@ -112,7 +112,7 @@ class ManageSubscriptionFormRenderer { if ($subscriber->isWPUser() || $subscriber->isWooCommerceUser()) { $wpCurrentUser = $this->wp->wpGetCurrentUser(); - if ($wpCurrentUser->user_email === $subscriber->email) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if ($wpCurrentUser->user_email === $subscriber->email) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $templateData['editEmailInfo'] = Helpers::replaceLinkTags( __('[link]Edit your profile[/link] to update your email.', 'mailpoet'), $this->wp->getEditProfileUrl(), diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php index 6304840e8e..ac7ef21df9 100644 --- a/lib/Subscription/Pages.php +++ b/lib/Subscription/Pages.php @@ -214,7 +214,7 @@ class Pages { global $post; if ( - ($post->post_title !== $this->wp->__('MailPoet Page', 'mailpoet')) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + ($post->post_title !== $this->wp->__('MailPoet Page', 'mailpoet')) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps || ($pageTitle !== $this->wp->singlePostTitle('', false)) ) { diff --git a/lib/Util/ConflictResolver.php b/lib/Util/ConflictResolver.php index 4d65e89a04..eeae8a7e31 100644 --- a/lib/Util/ConflictResolver.php +++ b/lib/Util/ConflictResolver.php @@ -84,12 +84,12 @@ class ConflictResolver { $_this->permittedAssetsLocations['styles'] = WPFunctions::get()->applyFilters('mailpoet_conflict_resolver_whitelist_style', $_this->permittedAssetsLocations['styles']); // unload all styles except from the list of allowed $dequeueStyles = function() use($_this) { - global $wp_styles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - if (!isset($wp_styles->registered)) return; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - if (empty($wp_styles->queue)) return; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - foreach ($wp_styles->queue as $wpStyle) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - if (empty($wp_styles->registered[$wpStyle])) continue; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $registeredStyle = $wp_styles->registered[$wpStyle]; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_styles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + if (!isset($wp_styles->registered)) return; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + if (empty($wp_styles->queue)) return; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + foreach ($wp_styles->queue as $wpStyle) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + if (empty($wp_styles->registered[$wpStyle])) continue; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $registeredStyle = $wp_styles->registered[$wpStyle]; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if (!is_string($registeredStyle->src)) { continue; } @@ -115,10 +115,10 @@ class ConflictResolver { $_this->permittedAssetsLocations['scripts'] = WPFunctions::get()->applyFilters('mailpoet_conflict_resolver_whitelist_script', $_this->permittedAssetsLocations['scripts']); // unload all scripts except from the list of allowed $dequeueScripts = function() use($_this) { - global $wp_scripts; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - foreach ($wp_scripts->queue as $wpScript) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - if (empty($wp_scripts->registered[$wpScript])) continue; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $registeredScript = $wp_scripts->registered[$wpScript]; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_scripts; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + foreach ($wp_scripts->queue as $wpScript) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + if (empty($wp_scripts->registered[$wpScript])) continue; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $registeredScript = $wp_scripts->registered[$wpScript]; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if (!is_string($registeredScript->src)) { continue; } @@ -143,8 +143,8 @@ class ConflictResolver { // mark editor as already enqueued to prevent loading its assets // when wp_enqueue_editor() used by some other plugin - global $wp_actions; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $wp_actions['wp_enqueue_editor'] = 1; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_actions; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $wp_actions['wp_enqueue_editor'] = 1; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps // prevent editor loading when used wp_editor() used by some other plugin WPFunctions::get()->addFilter('wp_editor_settings', function () { @@ -177,12 +177,12 @@ class ConflictResolver { ]; $disableWpTinymce = function() use ($tinyMceFooterScriptHooks) { - global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $actionName = 'admin_print_footer_scripts'; - if (!isset($wp_filter[$actionName])) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (!isset($wp_filter[$actionName])) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps return; } - foreach ($wp_filter[$actionName]->callbacks as $priority => $callbacks) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + foreach ($wp_filter[$actionName]->callbacks as $priority => $callbacks) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps foreach ($tinyMceFooterScriptHooks as $hook) { if (isset($callbacks[$hook])) { WPFunctions::get()->removeAction($actionName, $callbacks[$hook]['function'], $priority); diff --git a/lib/Util/Notices/DeprecatedShortcodeNotice.php b/lib/Util/Notices/DeprecatedShortcodeNotice.php index 37799036c6..8588924392 100644 --- a/lib/Util/Notices/DeprecatedShortcodeNotice.php +++ b/lib/Util/Notices/DeprecatedShortcodeNotice.php @@ -28,10 +28,10 @@ class DeprecatedShortcodeNotice { } public function isUsingDeprecatedShortcode() { - global $wp_filter;// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_filter;// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $hook = 'mailpoet_newsletter_shortcode'; - if (empty($wp_filter[$hook])) return false;// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $callbacks = $wp_filter[$hook];// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + if (empty($wp_filter[$hook])) return false;// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $callbacks = $wp_filter[$hook];// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if (empty($callbacks->callbacks) || !is_array($callbacks->callbacks)) return false; foreach ($callbacks->callbacks as $callbackByPriority) { if (empty($callbackByPriority) || !is_array($callbackByPriority)) continue; diff --git a/lib/WP/AutocompletePostListLoader.php b/lib/WP/AutocompletePostListLoader.php index 9719c54c9f..c2069110df 100644 --- a/lib/WP/AutocompletePostListLoader.php +++ b/lib/WP/AutocompletePostListLoader.php @@ -67,7 +67,7 @@ class AutocompletePostListLoader { foreach ($posts as $post) { $result[] = [ 'id' => (string)$post->ID, - 'name' => $post->post_title,// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'name' => $post->post_title,// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ]; } return $result; @@ -79,7 +79,7 @@ class AutocompletePostListLoader { $result = []; foreach ($terms as $term) { $result[] = [ - 'id' => (string)$term->term_id,// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'id' => (string)$term->term_id,// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'name' => $term->name, ]; } diff --git a/tasks/code_sniffer/MailPoet/ruleset.xml b/tasks/code_sniffer/MailPoet/ruleset.xml index b6e59c57f4..61054e91e9 100644 --- a/tasks/code_sniffer/MailPoet/ruleset.xml +++ b/tasks/code_sniffer/MailPoet/ruleset.xml @@ -198,7 +198,7 @@ - + diff --git a/tests/DataGenerator/Generators/WooCommercePastRevenues.php b/tests/DataGenerator/Generators/WooCommercePastRevenues.php index 792b689402..93b400af4c 100644 --- a/tests/DataGenerator/Generators/WooCommercePastRevenues.php +++ b/tests/DataGenerator/Generators/WooCommercePastRevenues.php @@ -61,7 +61,7 @@ class WooCommercePastRevenues implements Generator { $productCategory = $this->createProductCategory('WC Revenues Test Category ' . $this->getRandomString(), 'revenues-test-cat-' . $this->getRandomString()); $products = []; for ($i = 1; $i <= self::PRODUCTS_COUNT; $i++) { - $products[] = $this->createProduct("Product $i " . $this->getRandomString(), 100, [$productCategory->term_id]); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $products[] = $this->createProduct("Product $i " . $this->getRandomString(), 100, [$productCategory->term_id]); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } yield "Products done"; @@ -155,7 +155,7 @@ class WooCommercePastRevenues implements Generator { 'id' => $products[$i]->get_name(), 'name' => $products[$i]->get_id(), 'categories' => [[ - 'id' => $productCategory->term_id, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'id' => $productCategory->term_id, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'name' => $productCategory->name, ]], ]; diff --git a/tests/_support/DefaultsExtension.php b/tests/_support/DefaultsExtension.php index ade4063fa9..e249c313a6 100644 --- a/tests/_support/DefaultsExtension.php +++ b/tests/_support/DefaultsExtension.php @@ -46,9 +46,9 @@ class DefaultsExtension extends Extension { // get rid of 'blog/' prefix that is added automatically to rewrite rules on multisite by default // (init() loads 'permalink_structure' option from DB, flush_rules() regenerates 'rewrite_rules') - global $wp_rewrite; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $wp_rewrite->init(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $wp_rewrite->flush_rules(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_rewrite; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $wp_rewrite->init(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $wp_rewrite->flush_rules(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } private function setupWooCommerce() { @@ -93,7 +93,7 @@ class DefaultsExtension extends Extension { delete_transient('_wc_activation_redirect'); // mark all WC cron actions complete - $tableName = ! empty($wpdb->actionscheduler_actions) ? $wpdb->actionscheduler_actions : $wpdb->prefix . 'actionscheduler_actions';// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $tableName = ! empty($wpdb->actionscheduler_actions) ? $wpdb->actionscheduler_actions : $wpdb->prefix . 'actionscheduler_actions';// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $sql = "UPDATE {$tableName} SET status = 'complete'"; $wpdb->query($sql); } diff --git a/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php b/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php index 47456e8eb8..b7323ed62e 100644 --- a/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php +++ b/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php @@ -23,7 +23,7 @@ class AutomatedLatestContentTest extends \MailPoetTest { // https://codex.wordpress.org/Post_Types $revisionPostType = get_post_type_object('revision'); assert($revisionPostType instanceof \WP_Post_Type); - expect($revisionPostType->exclude_from_search)->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($revisionPostType->exclude_from_search)->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect(isset($response->data['revision']))->false(); } } diff --git a/tests/integration/Config/InitializerTest.php b/tests/integration/Config/InitializerTest.php index b6b32fc409..56a847cc89 100644 --- a/tests/integration/Config/InitializerTest.php +++ b/tests/integration/Config/InitializerTest.php @@ -4,10 +4,10 @@ namespace MailPoet\Test\Config; class InitializerTest extends \MailPoetTest { public function testItConfiguresHooks() { - global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $isHooked = false; // mailpoet should hook to 'wp_loaded' with priority of 10 - foreach ($wp_filter['wp_loaded'][10] as $name => $hook) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + foreach ($wp_filter['wp_loaded'][10] as $name => $hook) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps if (preg_match('/postInitialize/', $name)) $isHooked = true; } expect($isHooked)->true(); diff --git a/tests/integration/Config/InstallerTest.php b/tests/integration/Config/InstallerTest.php index 853a01c71b..1cd07c552d 100644 --- a/tests/integration/Config/InstallerTest.php +++ b/tests/integration/Config/InstallerTest.php @@ -46,18 +46,18 @@ class InstallerTest extends \MailPoetTest { $obj = new \stdClass(); $obj->slug = $this->slug; $obj->name = 'MailPoet Premium'; - $obj->new_version = '3.0.0-alpha.0.0.3.1'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $obj->new_version = '3.0.0-alpha.0.0.3.1'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $obj->requires = '4.6'; $obj->tested = '4.7.4'; $obj->downloaded = 12540; - $obj->last_updated = date('Y-m-d'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $obj->last_updated = date('Y-m-d'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $obj->sections = [ 'description' => 'The new version of the Premium plugin', 'another_section' => 'This is another section', 'changelog' => 'Some new features', ]; - $obj->download_link = home_url() . '/wp-content/uploads/mailpoet-premium.zip'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $obj->package = $obj->download_link; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $obj->download_link = home_url() . '/wp-content/uploads/mailpoet-premium.zip'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $obj->package = $obj->download_link; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps return $obj; }, ], @@ -65,8 +65,8 @@ class InstallerTest extends \MailPoetTest { ); $result = $installer->getPluginInformation(false, 'plugin_information', $args); expect($result->slug)->equals($this->slug); - expect($result->new_version)->notEmpty(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($result->download_link)->notEmpty(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($result->new_version)->notEmpty(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($result->download_link)->notEmpty(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($result->package)->notEmpty(); } diff --git a/tests/integration/Config/MP2MigratorTest.php b/tests/integration/Config/MP2MigratorTest.php index 2448eb022c..46c0044c9b 100644 --- a/tests/integration/Config/MP2MigratorTest.php +++ b/tests/integration/Config/MP2MigratorTest.php @@ -64,7 +64,7 @@ class MP2MigratorTest extends \MailPoetTest { // Check if the subscribers number is equal to the WordPress users number // On multisite environment, there's only 1 users table that's shared by subsites - $WPUsersCount = ORM::for_table($wpdb->base_prefix . 'users')->count(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $WPUsersCount = ORM::for_table($wpdb->base_prefix . 'users')->count(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect(Subscriber::count())->equals($WPUsersCount); // Check if the custom fields number is 0 @@ -310,10 +310,10 @@ class MP2MigratorTest extends \MailPoetTest { $table = MP_SUBSCRIBERS_TABLE; $subscriber = $wpdb->get_row("SELECT * FROM $table WHERE email='$email'"); expect($subscriber->email)->equals($email); - expect($subscriber->first_name)->equals($firstname); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($subscriber->last_name)->equals($lastname); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($subscriber->subscribed_ip)->equals($ip); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($subscriber->confirmed_ip)->equals($confirmedIp); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($subscriber->first_name)->equals($firstname); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($subscriber->last_name)->equals($lastname); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($subscriber->subscribed_ip)->equals($ip); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($subscriber->confirmed_ip)->equals($confirmedIp); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($subscriber->status)->equals('subscribed'); } diff --git a/tests/integration/Config/ShortcodesTest.php b/tests/integration/Config/ShortcodesTest.php index 07608f9485..5ac4d44ca4 100644 --- a/tests/integration/Config/ShortcodesTest.php +++ b/tests/integration/Config/ShortcodesTest.php @@ -69,7 +69,7 @@ class ShortcodesTest extends \MailPoetTest { expect((new WPFunctions)->isUserLoggedIn())->true(); $subscriber = Subscriber::create(); $subscriber->hydrate(Fixtures::get('subscriber_template')); - $subscriber->email = $wpUser->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $subscriber->email = $wpUser->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $subscriber->wpUserId = $wpUser->ID; $subscriber->save(); @@ -86,7 +86,7 @@ class ShortcodesTest extends \MailPoetTest { expect($wp->isUserLoggedIn())->true(); $subscriber = Subscriber::create(); $subscriber->hydrate(Fixtures::get('subscriber_template')); - $subscriber->email = $wpUser->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $subscriber->email = $wpUser->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $subscriber->wpUserId = $wpUser->ID; $subscriber->save(); @@ -105,7 +105,7 @@ class ShortcodesTest extends \MailPoetTest { public function testItDoesNotDisplayManageSubscriptionFormForLoggedinNonexistentSubscribers() { $wpUser = wp_set_current_user(1); expect((new WPFunctions)->isUserLoggedIn())->true(); - expect(Subscriber::findOne($wpUser->user_email))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect(Subscriber::findOne($wpUser->user_email))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $shortcodes = ContainerWrapper::getInstance()->get(Shortcodes::class); $shortcodes->init(); @@ -128,7 +128,7 @@ class ShortcodesTest extends \MailPoetTest { expect((new WPFunctions)->isUserLoggedIn())->true(); $subscriber = Subscriber::create(); $subscriber->hydrate(Fixtures::get('subscriber_template')); - $subscriber->email = $wpUser->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $subscriber->email = $wpUser->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $subscriber->wpUserId = $wpUser->ID; $subscriber->save(); @@ -141,7 +141,7 @@ class ShortcodesTest extends \MailPoetTest { public function testItDoesNotDisplayLinkToManageSubscriptionPageForLoggedinNonexistentSubscribers() { $wpUser = wp_set_current_user(1); expect((new WPFunctions)->isUserLoggedIn())->true(); - expect(Subscriber::findOne($wpUser->user_email))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect(Subscriber::findOne($wpUser->user_email))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $shortcodes = ContainerWrapper::getInstance()->get(Shortcodes::class); $shortcodes->init(); diff --git a/tests/integration/Config/UpdaterTest.php b/tests/integration/Config/UpdaterTest.php index f96850ae6c..f17e84bb6c 100644 --- a/tests/integration/Config/UpdaterTest.php +++ b/tests/integration/Config/UpdaterTest.php @@ -39,7 +39,7 @@ class UpdaterTest extends \MailPoetTest { public function testItChecksForUpdates() { $updateTransient = new \stdClass; - $updateTransient->last_checked = time(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $updateTransient->last_checked = time(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $updater = Stub::construct( $this->updater, [ @@ -62,7 +62,7 @@ class UpdaterTest extends \MailPoetTest { $this ); $result = $updater->checkForUpdate($updateTransient); - expect($result->last_checked)->greaterOrEquals($updateTransient->last_checked); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($result->last_checked)->greaterOrEquals($updateTransient->last_checked); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($result->checked[$this->pluginName])->equals($this->version); expect($result->response[$this->pluginName]->slug)->equals($this->slug); expect($result->response[$this->pluginName]->plugin)->equals($this->pluginName); diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php index 19ffdcdad3..9c00845580 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php @@ -52,7 +52,7 @@ class ShortcodesTest extends \MailPoetTest { expect(trim(Shortcodes::process($content)))->equals('Subject line with one shortcode:'); // when tag is found, the shortcode will be processed and replaced - expect(Shortcodes::process($content, $contentSource))->equals('Subject line with one shortcode: ' . $wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect(Shortcodes::process($content, $contentSource))->equals('Subject line with one shortcode: ' . $wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function _after() { diff --git a/tests/integration/Mailer/Methods/PHPMailTest.php b/tests/integration/Mailer/Methods/PHPMailTest.php index d4018884c2..5e3cc358be 100644 --- a/tests/integration/Mailer/Methods/PHPMailTest.php +++ b/tests/integration/Mailer/Methods/PHPMailTest.php @@ -54,7 +54,7 @@ class PHPMailTest extends \MailPoetTest { expect($mailer)->isInstanceOf('PHPMailer'); // uses PHP's mail() function - expect($mailer->Mailer)->equals('mail'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($mailer->Mailer)->equals('mail'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function testWhenReturnPathIsNullItIsSetToSenderEmail() { @@ -70,7 +70,7 @@ class PHPMailTest extends \MailPoetTest { public function testItCanConfigureMailerWithMessage() { $mailer = $this->mailer ->configureMailerWithMessage($this->newsletter, $this->subscriber, $this->extraParams); - expect($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($mailer->getToAddresses())->equals( [ [ @@ -81,8 +81,8 @@ class PHPMailTest extends \MailPoetTest { ); expect($mailer->getAllRecipientAddresses()) ->equals(['mailpoet-phoenix-test@mailinator.com' => true]); - expect($mailer->From)->equals($this->sender['from_email']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($mailer->FromName)->equals($this->sender['from_name']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($mailer->From)->equals($this->sender['from_email']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($mailer->FromName)->equals($this->sender['from_name']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($mailer->getReplyToAddresses())->equals( [ 'reply-to@mailpoet.com' => [ @@ -91,12 +91,12 @@ class PHPMailTest extends \MailPoetTest { ], ] ); - expect($mailer->Sender)->equals($this->returnPath); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($mailer->ContentType)->equals('text/html'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($mailer->Body) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($mailer->Sender)->equals($this->returnPath); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($mailer->ContentType)->equals('text/html'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($mailer->Body) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ->equals($this->newsletter['body']['html']); - expect($mailer->AltBody) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($mailer->AltBody) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ->equals($this->newsletter['body']['text']); expect($mailer->getCustomHeaders())->equals( [ @@ -116,8 +116,8 @@ class PHPMailTest extends \MailPoetTest { 'text' => 'TEXT body', ], ], $this->subscriber); - expect($mailer->ContentType)->equals('text/plain'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect($mailer->Body)->equals('TEXT body'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($mailer->ContentType)->equals('text/plain'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect($mailer->Body)->equals('TEXT body'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function testItCanProcessSubscriber() { diff --git a/tests/integration/Mailer/WordPress/WordpressMailerTest.php b/tests/integration/Mailer/WordPress/WordpressMailerTest.php index e3185fc32f..872b8fb3ce 100644 --- a/tests/integration/Mailer/WordPress/WordpressMailerTest.php +++ b/tests/integration/Mailer/WordPress/WordpressMailerTest.php @@ -8,7 +8,7 @@ use MailPoet\Mailer\MailerError; use MailPoet\Mailer\MetaInfo; use MailPoet\Subscribers\SubscribersRepository; -// phpcs:disable Squiz.NamingConventions.ValidVariableName.NotCamelCaps +// phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps class WordpressMailerTest extends \MailPoetTest { /** @var SubscribersRepository */ private $subscribersRepository; diff --git a/tests/integration/Newsletter/ShortcodesTest.php b/tests/integration/Newsletter/ShortcodesTest.php index a0c2bf8fc1..a0d9c97b14 100644 --- a/tests/integration/Newsletter/ShortcodesTest.php +++ b/tests/integration/Newsletter/ShortcodesTest.php @@ -159,7 +159,7 @@ class ShortcodesTest extends \MailPoetTest { $shortcodesObject->process(['[newsletter:post_title]'], $content); $wpPost = get_post($this->wPPost); assert($wpPost instanceof WP_Post); - expect($result['0'])->equals($wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($result['0'])->equals($wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function itCanProcessPostNotificationNewsletterNumberShortcode() { diff --git a/tests/integration/Segments/WooCommerceTest.php b/tests/integration/Segments/WooCommerceTest.php index dbbf3624a7..cf5efa53d7 100644 --- a/tests/integration/Segments/WooCommerceTest.php +++ b/tests/integration/Segments/WooCommerceTest.php @@ -46,7 +46,7 @@ class WooCommerceTest extends \MailPoetTest { $subscriber->hydrate([ 'first_name' => 'Mike', 'last_name' => 'Mike', - 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'wp_user_id' => $user->ID, ]); $subscriber->status = Subscriber::STATUS_SUBSCRIBED; @@ -59,7 +59,7 @@ class WooCommerceTest extends \MailPoetTest { ->where('wp_user_id', $user->ID) ->findOne(); expect($subscriber)->notEmpty(); - expect($subscriber->email)->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($subscriber->email)->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($subscriber->firstName)->equals($firstName); expect($subscriber->lastName)->equals($lastName); expect($subscriber->isWoocommerceUser)->equals(1); @@ -75,7 +75,7 @@ class WooCommerceTest extends \MailPoetTest { $subscriber->hydrate([ 'first_name' => 'Mike', 'last_name' => 'Mike', - 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'wp_user_id' => $user->ID, ]); $subscriber->status = Subscriber::STATUS_UNSUBSCRIBED; @@ -87,7 +87,7 @@ class WooCommerceTest extends \MailPoetTest { ->where('wp_user_id', $user->ID) ->findOne(); expect($subscriber)->notEmpty(); - expect($subscriber->email)->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($subscriber->email)->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($subscriber->firstName)->equals($firstName); expect($subscriber->lastName)->equals($lastName); expect($subscriber->isWoocommerceUser)->equals(1); @@ -102,7 +102,7 @@ class WooCommerceTest extends \MailPoetTest { $subscriber->hydrate([ 'first_name' => 'Mike', 'last_name' => 'Mike', - 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'wp_user_id' => $user->ID, ]); $subscriber->status = Subscriber::STATUS_UNSUBSCRIBED; @@ -158,7 +158,7 @@ class WooCommerceTest extends \MailPoetTest { $subscribersCount = $this->getSubscribersCount(); expect($subscribersCount)->equals(2); - $subscriber = Subscriber::where('email', $user->user_email)->findOne(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $subscriber = Subscriber::where('email', $user->user_email)->findOne(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED); expect($subscriber->source)->equals(Source::WOOCOMMERCE_USER); $subscriber = Subscriber::where('email', $guest['email'])->findOne(); @@ -234,7 +234,7 @@ class WooCommerceTest extends \MailPoetTest { $user = $this->insertRegisteredCustomerWithOrder(null, ['first_name' => '']); $this->woocommerceSegment->synchronizeCustomers(); update_post_meta($user->orderId, '_billing_first_name', 'First name'); - $this->createOrder(['email' => $user->user_email, 'first_name' => 'First name (newer)']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $this->createOrder(['email' => $user->user_email, 'first_name' => 'First name (newer)']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $this->woocommerceSegment->synchronizeCustomers(); $subscriber = Subscriber::where('wp_user_id', $user->ID)->findOne(); expect($subscriber->firstName)->equals('First name (newer)'); @@ -244,7 +244,7 @@ class WooCommerceTest extends \MailPoetTest { $user = $this->insertRegisteredCustomerWithOrder(null, ['last_name' => '']); $this->woocommerceSegment->synchronizeCustomers(); update_post_meta($user->orderId, '_billing_last_name', 'Last name'); - $this->createOrder(['email' => $user->user_email, 'last_name' => 'Last name (newer)']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $this->createOrder(['email' => $user->user_email, 'last_name' => 'Last name (newer)']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $this->woocommerceSegment->synchronizeCustomers(); $subscriber = Subscriber::where('wp_user_id', $user->ID)->findOne(); expect($subscriber->lastName)->equals('Last name (newer)'); @@ -285,13 +285,13 @@ class WooCommerceTest extends \MailPoetTest { public function testItDoesntRemoveRegisteredCustomersFromTrash() { $user = $this->insertRegisteredCustomer(); $this->woocommerceSegment->synchronizeCustomers(); - $subscriber = Subscriber::where("email", $user->user_email) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $subscriber = Subscriber::where("email", $user->user_email) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ->where('is_woocommerce_user', 1) ->findOne(); $subscriber->deletedAt = Carbon::now(); $subscriber->save(); $this->woocommerceSegment->synchronizeCustomers(); - $subscriber = Subscriber::where("email", $user->user_email) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $subscriber = Subscriber::where("email", $user->user_email) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps ->where('is_woocommerce_user', 1) ->findOne(); expect($subscriber->deletedAt)->notNull(); @@ -338,7 +338,7 @@ class WooCommerceTest extends \MailPoetTest { $subscriber->hydrate([ 'first_name' => 'John', 'last_name' => 'John', - 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'wp_user_id' => $user->ID, ]); $subscriber->status = Subscriber::STATUS_UNCONFIRMED; @@ -464,7 +464,7 @@ class WooCommerceTest extends \MailPoetTest { $user2 = $this->insertRegisteredCustomer(); $subscriber1 = Subscriber::createOrUpdate([ - 'email' => $user1->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $user1->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'is_woocommerce_user' => 1, 'status' => Subscriber::STATUS_UNSUBSCRIBED, ]); @@ -475,7 +475,7 @@ class WooCommerceTest extends \MailPoetTest { $association1->save(); $subscriber2 = Subscriber::createOrUpdate([ - 'email' => $user2->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $user2->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'is_woocommerce_user' => 1, 'status' => Subscriber::STATUS_UNSUBSCRIBED, 'confirmed_ip' => '123', @@ -508,7 +508,7 @@ class WooCommerceTest extends \MailPoetTest { $user2 = $this->insertRegisteredCustomer(); $subscriber1 = Subscriber::createOrUpdate([ - 'email' => $user1->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $user1->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'is_woocommerce_user' => 1, 'status' => Subscriber::STATUS_SUBSCRIBED, ]); @@ -519,7 +519,7 @@ class WooCommerceTest extends \MailPoetTest { $association1->save(); $subscriber2 = Subscriber::createOrUpdate([ - 'email' => $user2->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'email' => $user2->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'is_woocommerce_user' => 1, 'status' => Subscriber::STATUS_SUBSCRIBED, 'confirmed_ip' => '123', @@ -673,7 +673,7 @@ class WooCommerceTest extends \MailPoetTest { // add customer role $user = new WPUserWithExtraProps($id); $user->add_role('customer'); - $this->userEmails[] = $user->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $this->userEmails[] = $user->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps return $user; } @@ -697,7 +697,7 @@ class WooCommerceTest extends \MailPoetTest { $number = !is_null($number) ? (int)$number : mt_rand(); $data = is_array($data) ? $data : []; $user = $this->insertRegisteredCustomer($number, $data['first_name'] ?? null, $data['last_name'] ?? null); - $data['email'] = $user->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $data['email'] = $user->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $data['user_id'] = $user->ID; $user->orderId = $this->createOrder($data); return $user; diff --git a/tests/integration/Util/ConflictResolverTest.php b/tests/integration/Util/ConflictResolverTest.php index 2d6ae077a5..f05c5a7b67 100644 --- a/tests/integration/Util/ConflictResolverTest.php +++ b/tests/integration/Util/ConflictResolverTest.php @@ -13,8 +13,8 @@ class ConflictResolverTest extends \MailPoetTest { parent::__construct(); $this->conflictResolver = new ConflictResolver(); $this->conflictResolver->init(); - global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $this->wpFilter = $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $this->wpFilter = $wp_filter; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function testItResolvesRouterUrlQueryParametersConflict() { @@ -39,10 +39,10 @@ class ConflictResolverTest extends \MailPoetTest { do_action('admin_print_styles'); do_action('admin_print_footer_scripts'); do_action('admin_footer'); - global $wp_styles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_styles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps // it should dequeue all styles except those found on the list of permitted locations - expect(in_array('select2', $wp_styles->queue))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect(in_array('permitted_style', $wp_styles->queue))->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect(in_array('select2', $wp_styles->queue))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect(in_array('permitted_style', $wp_styles->queue))->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function testItWhitelistsStyles() { @@ -60,9 +60,9 @@ class ConflictResolverTest extends \MailPoetTest { do_action('admin_print_styles'); do_action('admin_print_footer_scripts'); do_action('admin_footer'); - global $wp_styles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_styles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps // it should not dequeue select2 style - expect(in_array('select2', $wp_styles->queue))->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect(in_array('select2', $wp_styles->queue))->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function testItUnloadsAllScriptsFromLocationsNotOnPermittedList() { @@ -76,11 +76,11 @@ class ConflictResolverTest extends \MailPoetTest { $this->conflictResolver->resolveScriptsConflict(); do_action('wp_print_scripts'); do_action('admin_print_footer_scripts'); - global $wp_scripts; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_scripts; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps // it should dequeue all scripts except those found on the list of permitted locations - expect(in_array('select2', $wp_scripts->queue))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect(in_array('some_random_script', $wp_scripts->queue))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - expect(in_array('permitted_script', $wp_scripts->queue))->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect(in_array('select2', $wp_scripts->queue))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect(in_array('some_random_script', $wp_scripts->queue))->false(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + expect(in_array('permitted_script', $wp_scripts->queue))->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function testItWhitelistsScripts() { @@ -96,9 +96,9 @@ class ConflictResolverTest extends \MailPoetTest { $this->conflictResolver->resolveStylesConflict(); do_action('wp_print_scripts'); do_action('admin_print_footer_scripts'); - global $wp_scripts; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $wp_scripts; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps // it should not dequeue select2 script - expect(in_array('select2', $wp_scripts->queue))->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect(in_array('select2', $wp_scripts->queue))->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function _after() { diff --git a/tests/integration/WP/FunctionsTest.php b/tests/integration/WP/FunctionsTest.php index a08ad23f0e..4b7f86ae21 100644 --- a/tests/integration/WP/FunctionsTest.php +++ b/tests/integration/WP/FunctionsTest.php @@ -13,9 +13,9 @@ class FunctionsTest extends \MailPoetTest { public function _before() { parent::_before(); - global $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $this->contentWidth = $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $content_width = 150; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $this->contentWidth = $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $content_width = 150; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $this->action = 'mailpoet_test_action'; $this->filter = 'mailpoet_test_filter'; $this->wp = new WPFunctions; @@ -94,7 +94,7 @@ class FunctionsTest extends \MailPoetTest { } public function _after() { - global $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps - $content_width = $this->contentWidth; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + global $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps + $content_width = $this->contentWidth; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } } diff --git a/tests/unit/Entities/SubscriberEntityTest.php b/tests/unit/Entities/SubscriberEntityTest.php index 9b938dfdb9..48300c1142 100644 --- a/tests/unit/Entities/SubscriberEntityTest.php +++ b/tests/unit/Entities/SubscriberEntityTest.php @@ -6,11 +6,11 @@ class SubscriberEntityTest extends \MailPoetUnitTest { public function testMagicGetterReturnsData() { $subscriber = new SubscriberEntity(); $subscriber->setWpUserId(4); - expect($subscriber->wp_user_id)->equals(4);// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($subscriber->wp_user_id)->equals(4);// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } public function testMagicGetterReturnsNullForUnknown() { $subscriber = new SubscriberEntity(); - expect($subscriber->non_existing_property)->null();// phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($subscriber->non_existing_property)->null();// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } }