From 685b4885c0d54d03df3cd0412ef3bc9e586cbb03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Tue, 7 Jan 2020 17:23:51 +0100 Subject: [PATCH] Exclude WordPress and WooCommerce variables from camel case conversion [MAILPOET-1796] --- lib/AdminPages/Pages/DynamicSegments.php | 2 +- .../Events/PurchasedInCategory.php | 2 +- .../WooCommerce/Events/PurchasedProduct.php | 2 +- lib/Config/Populator.php | 6 ++-- lib/Form/Widget.php | 4 +-- lib/Mailer/Methods/PHPMail.php | 16 ++++----- lib/Mailer/WordPress/WordPressMailer.php | 14 ++++---- lib/Newsletter/AutomatedLatestContent.php | 6 ++-- .../Editor/MetaInformationManager.php | 4 +-- lib/Newsletter/Editor/PostContentManager.php | 10 +++--- .../PostTransformerContentsExtractor.php | 6 ++-- .../Editor/TitleListTransformer.php | 2 +- .../Scheduler/PostNotificationScheduler.php | 2 +- .../Shortcodes/Categories/Newsletter.php | 4 +-- .../Shortcodes/Categories/Subscriber.php | 2 +- lib/Router/Endpoints/Track.php | 22 ++++++------ lib/Segments/WP.php | 10 +++--- lib/Segments/WooCommerce.php | 4 +-- .../JSON/v1/AutomatedLatestContentTest.php | 2 +- tests/integration/Config/MP2MigratorTest.php | 10 +++--- .../SendingQueue/Tasks/ShortcodesTest.php | 2 +- .../Mailer/Methods/PHPMailTest.php | 24 +++++++------ .../Mailer/WordPress/WordpressMailerTest.php | 28 +++++++-------- .../integration/Newsletter/ShortcodesTest.php | 2 +- .../integration/Segments/WooCommerceTest.php | 34 +++++++++---------- 25 files changed, 111 insertions(+), 109 deletions(-) diff --git a/lib/AdminPages/Pages/DynamicSegments.php b/lib/AdminPages/Pages/DynamicSegments.php index beba39bf56..e70059432a 100644 --- a/lib/AdminPages/Pages/DynamicSegments.php +++ b/lib/AdminPages/Pages/DynamicSegments.php @@ -67,7 +67,7 @@ class DynamicSegments { $products = $this->wp->getPosts($args); return array_map(function ($product) { return [ - 'title' => $product->postTitle, + 'title' => $product->post_title, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'ID' => $product->ID, ]; }, $products); diff --git a/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php b/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php index 1f513ded71..4186a91798 100644 --- a/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php +++ b/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php @@ -80,7 +80,7 @@ class PurchasedInCategory { return array_map(function($category) { return [ - 'id' => $category->termId, + 'id' => $category->term_id, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'name' => $category->name, ]; }, $allCategories); diff --git a/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php b/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php index a35f9b8a49..6e09ef314c 100644 --- a/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php +++ b/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php @@ -90,7 +90,7 @@ class PurchasedProduct { $woocommerceProducts = array_map(function($product) { return [ 'id' => $product->ID, - 'name' => $product->postTitle, + 'name' => $product->post_title, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps ]; }, $woocommerceProducts); return $woocommerceProducts; diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php index 58a7d2d3c4..af16726ffa 100644 --- a/lib/Config/Populator.php +++ b/lib/Config/Populator.php @@ -182,7 +182,7 @@ class Populator { $page = null; if (!empty($pages)) { $page = array_shift($pages); - if (strpos($page->postContent, '[mailpoet_page]') === false) { + if (strpos($page->post_content, '[mailpoet_page]') === false) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $page = null; } } @@ -220,8 +220,8 @@ class Populator { // set default sender info based on current user $sender = [ - 'name' => $currentUser->displayName, - 'address' => $currentUser->userEmail, + 'name' => $currentUser->display_name, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + 'address' => $currentUser->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps ]; // set default from name & address diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php index 08590a6a39..8cab535829 100644 --- a/lib/Form/Widget.php +++ b/lib/Form/Widget.php @@ -181,7 +181,7 @@ class Widget extends \WP_Widget { 'widget_title', !empty($instance['title']) ? $instance['title'] : '', $instance, - $this->idBase + $this->id_base // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps ); // get form @@ -206,7 +206,7 @@ class Widget extends \WP_Widget { $output = ''; if (!empty($body)) { - $formId = $this->idBase . '_' . $form['id']; + $formId = $this->id_base . '_' . $form['id']; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $data = [ 'form_id' => $formId, 'form_type' => $formType, diff --git a/lib/Mailer/Methods/PHPMail.php b/lib/Mailer/Methods/PHPMail.php index 27e32a6b64..12d3d6f1f6 100644 --- a/lib/Mailer/Methods/PHPMail.php +++ b/lib/Mailer/Methods/PHPMail.php @@ -62,17 +62,17 @@ class PHPMail { $mailer->clearAddresses(); $mailer->clearCustomHeaders(); $mailer->isHTML(!empty($newsletter['body']['html'])); - $mailer->charSet = 'UTF-8'; + $mailer->CharSet = 'UTF-8'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $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'] : ''; - $mailer->body = (!empty($newsletter['body']['html'])) ? $newsletter['body']['html'] : $newsletter['body']['text']; - if ($mailer->contentType !== 'text/plain') { - $mailer->altBody = (!empty($newsletter['body']['text'])) ? $newsletter['body']['text'] : ''; + $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->sender = $this->returnPath; + $mailer->Sender = $this->returnPath; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps if (!empty($extraParams['unsubscribe_url'])) { $this->mailer->addCustomHeader('List-Unsubscribe', $extraParams['unsubscribe_url']); } @@ -84,8 +84,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)) { - $mailer->encoding = 'base64'; + if (\PHPMailer::hasLineLongerThanMax($mailer->Body)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $mailer->Encoding = 'base64'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } return $mailer; diff --git a/lib/Mailer/WordPress/WordPressMailer.php b/lib/Mailer/WordPress/WordPressMailer.php index d771258e5d..669d95e0e5 100644 --- a/lib/Mailer/WordPress/WordPressMailer.php +++ b/lib/Mailer/WordPress/WordPressMailer.php @@ -40,7 +40,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'; + $this->Mailer = 'mail'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps // Prepare everything (including the message) for sending. $this->preSend(); @@ -74,16 +74,16 @@ class WordPressMailer extends \PHPMailer { private function getEmail() { $email = [ - 'subject' => $this->subject, + 'subject' => $this->Subject, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'body' => [], ]; - if ($this->contentType === 'text/plain') { - $email['body']['text'] = $this->body; - } elseif ($this->contentType === 'text/html') { - $text = @Html2Text::convert(strtolower($this->charSet) === 'utf-8' ? $this->body : utf8_encode($this->body)); + if ($this->ContentType === 'text/plain') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $email['body']['text'] = $this->Body; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + } elseif ($this->ContentType === 'text/html') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $text = @Html2Text::convert(strtolower($this->CharSet) === 'utf-8' ? $this->Body : utf8_encode($this->Body)); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $email['body']['text'] = $text; - $email['body']['html'] = $this->body; + $email['body']['html'] = $this->Body; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } else { throw new \phpmailerException('Unsupported email content type has been used. Please use only text or HTML emails.'); } diff --git a/lib/Newsletter/AutomatedLatestContent.php b/lib/Newsletter/AutomatedLatestContent.php index 047f18a2dc..be27d68a9f 100644 --- a/lib/Newsletter/AutomatedLatestContent.php +++ b/lib/Newsletter/AutomatedLatestContent.php @@ -37,8 +37,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->isArchive = true; - $query->isHome = false; + $query->is_archive = true; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $query->is_home = false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } public function getPosts($args, $postsToExclude = []) { @@ -167,7 +167,7 @@ class AutomatedLatestContent { foreach ($posts as $post) { $postsToLog[] = [ 'id' => $post->ID, - 'post_date' => $post->postDate, + 'post_date' => $post->post_date, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps ]; } $this->loggerFactory->getLogger(LoggerFactory::TOPIC_POST_NOTIFICATIONS)->addInfo( diff --git a/lib/Newsletter/Editor/MetaInformationManager.php b/lib/Newsletter/Editor/MetaInformationManager.php index 5a949031a2..560a772691 100644 --- a/lib/Newsletter/Editor/MetaInformationManager.php +++ b/lib/Newsletter/Editor/MetaInformationManager.php @@ -14,7 +14,7 @@ class MetaInformationManager { if (isset($args['showAuthor']) && $args['showAuthor'] === $positionField) { $text[] = self::getPostAuthor( - $post->postAuthor, + $post->post_author, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $args['authorPrecededBy'] ); } @@ -22,7 +22,7 @@ class MetaInformationManager { if (isset($args['showCategories']) && $args['showCategories'] === $positionField) { $text[] = self::getPostCategories( $post->ID, - $post->postType, + $post->post_type, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $args['categoriesPrecededBy'] ); } diff --git a/lib/Newsletter/Editor/PostContentManager.php b/lib/Newsletter/Editor/PostContentManager.php index 10a6e63be3..54c3124c3b 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->postType === 'product') { + if ($this->woocommerceHelper->isWooCommerceActive() && $post->post_type === 'product') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $product = $this->woocommerceHelper->wcGetProduct($post->ID); if ($product) { return $this->getContentForProduct($product, $displayType); } } if ($displayType === 'excerpt') { - if (!empty($post->postExcerpt)) { - return self::stripShortCodes($post->postExcerpt); + if (!empty($post->post_excerpt)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + return self::stripShortCodes($post->post_excerpt); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } - return $this->generateExcerpt($post->postContent); + return $this->generateExcerpt($post->post_content); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } - return self::stripShortCodes($post->postContent); + return self::stripShortCodes($post->post_content); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } public function filterContent($content, $displayType, $withPostClass = true) { diff --git a/lib/Newsletter/Editor/PostTransformerContentsExtractor.php b/lib/Newsletter/Editor/PostTransformerContentsExtractor.php index 03bd5dce5b..21d776bc8e 100644 --- a/lib/Newsletter/Editor/PostTransformerContentsExtractor.php +++ b/lib/Newsletter/Editor/PostTransformerContentsExtractor.php @@ -68,7 +68,7 @@ class PostTransformerContentsExtractor { public function getFeaturedImage($post) { $postId = $post->ID; - $postTitle = $this->sanitizeTitle($post->postTitle); + $postTitle = $this->sanitizeTitle($post->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $imageFullWidth = (bool)filter_var($this->args['imageFullWidth'], FILTER_VALIDATE_BOOLEAN); if (!has_post_thumbnail($postId)) { @@ -125,7 +125,7 @@ class PostTransformerContentsExtractor { } public function getTitle($post) { - $title = $this->sanitizeTitle($post->postTitle); + $title = $this->sanitizeTitle($post->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps if (filter_var($this->args['titleIsLink'], FILTER_VALIDATE_BOOLEAN)) { $title = '' . $title . ''; @@ -182,7 +182,7 @@ class PostTransformerContentsExtractor { } public function isProduct($post) { - return $post->postType === 'product'; + return $post->post_type === 'product'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } /** diff --git a/lib/Newsletter/Editor/TitleListTransformer.php b/lib/Newsletter/Editor/TitleListTransformer.php index dec50603d3..1369f0eb39 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->postTitle; + $title = $post->post_title; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $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 b0dfe49fbd..016e6704d5 100644 --- a/lib/Newsletter/Scheduler/PostNotificationScheduler.php +++ b/lib/Newsletter/Scheduler/PostNotificationScheduler.php @@ -40,7 +40,7 @@ class PostNotificationScheduler { ] ); $types = Posts::getTypes(); - if (($newStatus !== 'publish') || !isset($types[$post->postType])) { + if (($newStatus !== 'publish') || !isset($types[$post->post_type])) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps return; } $this->schedulePostNotification($post->ID); diff --git a/lib/Newsletter/Shortcodes/Categories/Newsletter.php b/lib/Newsletter/Shortcodes/Categories/Newsletter.php index f92104aeff..550055a22f 100644 --- a/lib/Newsletter/Shortcodes/Categories/Newsletter.php +++ b/lib/Newsletter/Shortcodes/Categories/Newsletter.php @@ -44,8 +44,8 @@ class Newsletter { // 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->isArchive = true; - $query->isHome = false; + $query->is_archive = true; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $query->is_home = false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } private static function getLatestWPPost($postIds) { diff --git a/lib/Newsletter/Shortcodes/Categories/Subscriber.php b/lib/Newsletter/Shortcodes/Categories/Subscriber.php index 5c95614da6..5756b32941 100644 --- a/lib/Newsletter/Shortcodes/Categories/Subscriber.php +++ b/lib/Newsletter/Shortcodes/Categories/Subscriber.php @@ -31,7 +31,7 @@ class Subscriber { case 'displayname': if ($subscriber && $subscriber->wpUserId) { $wpUser = WPFunctions::get()->getUserdata($subscriber->wpUserId); - return $wpUser->userLogin; + return $wpUser->user_login; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } return $defaultValue; case 'count': diff --git a/lib/Router/Endpoints/Track.php b/lib/Router/Endpoints/Track.php index 071555e9d3..8706b79922 100644 --- a/lib/Router/Endpoints/Track.php +++ b/lib/Router/Endpoints/Track.php @@ -51,23 +51,23 @@ class Track { public function _processTrackData($data) { $data = (object)Links::transformUrlDataObject($data); - if (empty($data->queueId) || - empty($data->subscriberId) || - empty($data->subscriberToken) + 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 ) { return false; } - $data->queue = SendingQueue::findOne($data->queueId); + $data->queue = SendingQueue::findOne($data->queue_id); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps if ($data->queue instanceof SendingQueue) { $data->queue = SendingTask::createFromQueue($data->queue); } - $data->subscriber = Subscriber::findOne($data->subscriberId) ?: null; - $data->newsletter = (!empty($data->queue->newsletterId)) ? - Newsletter::findOne($data->queue->newsletterId) : + $data->subscriber = Subscriber::findOne($data->subscriber_id) ?: null; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $data->newsletter = (!empty($data->queue->newsletter_id)) ? // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + Newsletter::findOne($data->queue->newsletter_id) : // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps false; - if (!empty($data->linkHash)) { - $data->link = NewsletterLink::where('hash', $data->linkHash) - ->where('queue_id', $data->queueId) + if (!empty($data->link_hash)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $data->link = NewsletterLink::where('hash', $data->link_hash) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + ->where('queue_id', $data->queue_id) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps ->findOne(); } return $this->_validateTrackData($data); @@ -75,7 +75,7 @@ class Track { public function _validateTrackData($data) { if (!$data->subscriber || !$data->queue || !$data->newsletter) return false; - $subscriberTokenMatch = $this->linkTokens->verifyToken($data->subscriber, $data->subscriberToken); + $subscriberTokenMatch = $this->linkTokens->verifyToken($data->subscriber, $data->subscriber_token); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps if (!$subscriberTokenMatch) { $this->terminate(403); } diff --git a/lib/Segments/WP.php b/lib/Segments/WP.php index 297609cb0f..fe89583784 100644 --- a/lib/Segments/WP.php +++ b/lib/Segments/WP.php @@ -40,16 +40,16 @@ class WP { case 'added_existing_user': default: // get first name & last name - $firstName = $wpUser->firstName; - $lastName = $wpUser->lastName; - if (empty($wpUser->firstName) && empty($wpUser->lastName)) { - $firstName = $wpUser->displayName; + $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 } $signupConfirmationEnabled = SettingsController::getInstance()->get('signup_confirmation.enabled'); // subscriber data $data = [ 'wp_user_id' => $wpUser->ID, - 'email' => $wpUser->userEmail, + 'email' => $wpUser->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'first_name' => $firstName, 'last_name' => $lastName, 'status' => $signupConfirmationEnabled ? Subscriber::STATUS_UNCONFIRMED : Subscriber::STATUS_SUBSCRIBED, diff --git a/lib/Segments/WooCommerce.php b/lib/Segments/WooCommerce.php index 01facd5efd..3c4fb830ea 100644 --- a/lib/Segments/WooCommerce.php +++ b/lib/Segments/WooCommerce.php @@ -122,11 +122,11 @@ class WooCommerce { $mailpoetEmailColumn = $wpdb->get_row( 'SHOW FULL COLUMNS FROM ' . MP_SUBSCRIBERS_TABLE . ' WHERE Field = "email"' ); - $this->mailpoetEmailCollation = $mailpoetEmailColumn->collation; + $this->mailpoetEmailCollation = $mailpoetEmailColumn->Collation; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $wpPostmetaValueColumn = $wpdb->get_row( 'SHOW FULL COLUMNS FROM ' . $wpdb->postmeta . ' WHERE Field = "meta_value"' ); - $this->wpPostmetaValueCollation = $wpPostmetaValueColumn->collation; + $this->wpPostmetaValueCollation = $wpPostmetaValueColumn->Collation; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } private function needsCollationChange($collation1, $collation2) { diff --git a/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php b/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php index 36589406ee..a668b56ca0 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 { // WP's default post type 'revision' is excluded from search // https://codex.wordpress.org/Post_Types $revisionPostType = get_post_type_object('revision'); - expect($revisionPostType->excludeFromSearch)->true(); + expect($revisionPostType->exclude_from_search)->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps expect(isset($response->data['revision']))->false(); } } diff --git a/tests/integration/Config/MP2MigratorTest.php b/tests/integration/Config/MP2MigratorTest.php index 2ff124146f..c8b1dc9d5e 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->basePrefix . 'users')->count(); + $WPUsersCount = ORM::for_table($wpdb->base_prefix . 'users')->count(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 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->firstName)->equals($firstname); - expect($subscriber->lastName)->equals($lastname); - expect($subscriber->subscribedIp)->equals($ip); - expect($subscriber->confirmedIp)->equals($confirmedIp); + 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->status)->equals('subscribed'); } diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php index 8500292b34..e0efea6c9f 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php @@ -46,7 +46,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->postTitle); + expect(Shortcodes::process($content, $contentSource))->equals('Subject line with one shortcode: ' . $wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } public function _after() { diff --git a/tests/integration/Mailer/Methods/PHPMailTest.php b/tests/integration/Mailer/Methods/PHPMailTest.php index 1044c07d3b..679053783e 100644 --- a/tests/integration/Mailer/Methods/PHPMailTest.php +++ b/tests/integration/Mailer/Methods/PHPMailTest.php @@ -51,7 +51,9 @@ class PHPMailTest extends \MailPoetTest { public function testItCanBuildMailer() { $mailer = $this->mailer->buildMailer(); expect($mailer)->isInstanceOf('PHPMailer'); - expect($mailer->mailer)->equals('mail'); // uses PHP's mail() function + + // uses PHP's mail() function + expect($mailer->Mailer)->equals('mail'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } public function testWhenReturnPathIsNullItIsSetToSenderEmail() { @@ -67,7 +69,7 @@ class PHPMailTest extends \MailPoetTest { public function testItCanConfigureMailerWithMessage() { $mailer = $this->mailer ->configureMailerWithMessage($this->newsletter, $this->subscriber, $this->extraParams); - expect($mailer->charSet)->equals('UTF-8'); + expect($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps expect($mailer->getToAddresses())->equals( [ [ @@ -78,8 +80,8 @@ class PHPMailTest extends \MailPoetTest { ); expect($mailer->getAllRecipientAddresses()) ->equals(['mailpoet-phoenix-test@mailinator.com' => true]); - expect($mailer->from)->equals($this->sender['from_email']); - expect($mailer->fromName)->equals($this->sender['from_name']); + 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->getReplyToAddresses())->equals( [ 'reply-to@mailpoet.com' => [ @@ -88,12 +90,12 @@ class PHPMailTest extends \MailPoetTest { ], ] ); - expect($mailer->sender)->equals($this->returnPath); - expect($mailer->contentType)->equals('text/html'); - expect($mailer->subject)->equals($this->newsletter['subject']); - expect($mailer->body) + 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 ->equals($this->newsletter['body']['html']); - expect($mailer->altBody) + expect($mailer->AltBody) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps ->equals($this->newsletter['body']['text']); expect($mailer->getCustomHeaders())->equals( [ @@ -113,8 +115,8 @@ class PHPMailTest extends \MailPoetTest { 'text' => 'TEXT body', ], ], $this->subscriber); - expect($mailer->contentType)->equals('text/plain'); - expect($mailer->body)->equals('TEXT body'); + expect($mailer->ContentType)->equals('text/plain'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + expect($mailer->Body)->equals('TEXT body'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } public function testItCanProcessSubscriber() { diff --git a/tests/integration/Mailer/WordPress/WordpressMailerTest.php b/tests/integration/Mailer/WordPress/WordpressMailerTest.php index 6911698895..99116e5dfc 100644 --- a/tests/integration/Mailer/WordPress/WordpressMailerTest.php +++ b/tests/integration/Mailer/WordPress/WordpressMailerTest.php @@ -45,8 +45,8 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com'); - $wpMailer->subject = 'Subject'; - $wpMailer->body = 'Email Text Body'; + $wpMailer->Subject = 'Subject'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wpMailer->Body = 'Email Text Body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $wpMailer->isHTML(false); $wpMailer->send(); } @@ -66,8 +66,8 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com', 'Full Name'); - $wpMailer->subject = 'Subject'; - $wpMailer->body = 'Body'; + $wpMailer->Subject = 'Subject'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wpMailer->Body = 'Body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $wpMailer->isHTML(false); $wpMailer->send(); } @@ -90,8 +90,8 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com'); - $wpMailer->subject = 'Subject'; - $wpMailer->body = 'Email Html Body'; + $wpMailer->Subject = 'Subject'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wpMailer->Body = 'Email Html Body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $wpMailer->isHTML(true); $wpMailer->send(); } @@ -107,7 +107,7 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com'); - $wpMailer->body = 'body'; + $wpMailer->Body = 'body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps expect($wpMailer->send())->true(); } @@ -126,7 +126,7 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com'); - $wpMailer->body = 'body'; + $wpMailer->Body = 'body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps expect($wpMailer->send())->true(); } @@ -144,7 +144,7 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com'); - $wpMailer->body = 'body'; + $wpMailer->Body = 'body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $errorMessage = null; try { @@ -167,8 +167,8 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com'); - $wpMailer->body = 'body'; - $wpMailer->contentType = 'application/json'; + $wpMailer->Body = 'body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wpMailer->ContentType = 'application/json'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $this->expectException(\phpmailerException::class); $wpMailer->send(); } @@ -187,7 +187,7 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com'); - $wpMailer->body = 'body'; + $wpMailer->Body = 'body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $errorMessage = null; try { @@ -225,8 +225,8 @@ class WordpressMailerTest extends \MailPoetTest { $wpMailer = new WordPressMailer($mailer, $fallbackMailer, new MetaInfo, $this->subscribersRepository); $wpMailer->addAddress('email@example.com', 'Full Name'); - $wpMailer->subject = 'Subject'; - $wpMailer->body = 'Body'; + $wpMailer->Subject = 'Subject'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps + $wpMailer->Body = 'Body'; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $wpMailer->send(); } diff --git a/tests/integration/Newsletter/ShortcodesTest.php b/tests/integration/Newsletter/ShortcodesTest.php index 3f07379f52..cb5f0e9ab2 100644 --- a/tests/integration/Newsletter/ShortcodesTest.php +++ b/tests/integration/Newsletter/ShortcodesTest.php @@ -134,7 +134,7 @@ class ShortcodesTest extends \MailPoetTest { $result = $shortcodesObject->process(['[newsletter:post_title]'], $content); $wpPost = get_post($this->wPPost); - expect($result['0'])->equals($wpPost->postTitle); + expect($result['0'])->equals($wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps } public function itCanProcessPostNotificationNewsletterNumberShortcode() { diff --git a/tests/integration/Segments/WooCommerceTest.php b/tests/integration/Segments/WooCommerceTest.php index 11bab50192..5c9995ba84 100644 --- a/tests/integration/Segments/WooCommerceTest.php +++ b/tests/integration/Segments/WooCommerceTest.php @@ -41,7 +41,7 @@ class WooCommerceTest extends \MailPoetTest { $subscriber->hydrate([ 'first_name' => 'Mike', 'last_name' => 'Mike', - 'email' => $user->userEmail, + 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'wp_user_id' => $user->ID, ]); $subscriber->status = Subscriber::STATUS_SUBSCRIBED; @@ -54,7 +54,7 @@ class WooCommerceTest extends \MailPoetTest { ->where('wp_user_id', $user->ID) ->findOne(); expect($subscriber)->notEmpty(); - expect($subscriber->email)->equals($user->userEmail); + expect($subscriber->email)->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps expect($subscriber->isWoocommerceUser)->equals(1); expect($subscriber->source)->equals(Source::WOOCOMMERCE_USER); expect($subscriber->deletedAt)->equals(null); @@ -66,7 +66,7 @@ class WooCommerceTest extends \MailPoetTest { $subscriber->hydrate([ 'first_name' => 'Mike', 'last_name' => 'Mike', - 'email' => $user->userEmail, + 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'wp_user_id' => $user->ID, ]); $subscriber->status = Subscriber::STATUS_UNSUBSCRIBED; @@ -78,7 +78,7 @@ class WooCommerceTest extends \MailPoetTest { ->where('wp_user_id', $user->ID) ->findOne(); expect($subscriber)->notEmpty(); - expect($subscriber->email)->equals($user->userEmail); + expect($subscriber->email)->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps expect($subscriber->isWoocommerceUser)->equals(1); expect($subscriber->source)->equals(Source::WORDPRESS_USER); // no overriding expect($subscriber->status)->equals(Subscriber::STATUS_UNSUBSCRIBED); // no overriding @@ -91,7 +91,7 @@ class WooCommerceTest extends \MailPoetTest { $subscriber->hydrate([ 'first_name' => 'Mike', 'last_name' => 'Mike', - 'email' => $user->userEmail, + 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'wp_user_id' => $user->ID, ]); $subscriber->status = Subscriber::STATUS_UNSUBSCRIBED; @@ -126,7 +126,7 @@ class WooCommerceTest extends \MailPoetTest { $this->woocommerceSegment->synchronizeCustomers(); $subscribersCount = $this->getSubscribersCount(); expect($subscribersCount)->equals(2); - $subscriber = Subscriber::where('email', $user->userEmail)->findOne(); + $subscriber = Subscriber::where('email', $user->user_email)->findOne(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps expect($subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED); expect($subscriber->source)->equals(Source::WOOCOMMERCE_USER); $subscriber = Subscriber::where('email', $guest['email'])->findOne(); @@ -202,7 +202,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->userEmail, 'first_name' => 'First name (newer)']); + $this->createOrder(['email' => $user->user_email, 'first_name' => 'First name (newer)']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $this->woocommerceSegment->synchronizeCustomers(); $subscriber = Subscriber::where('wp_user_id', $user->ID)->findOne(); expect($subscriber->firstName)->equals('First name (newer)'); @@ -212,7 +212,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->userEmail, 'last_name' => 'Last name (newer)']); + $this->createOrder(['email' => $user->user_email, 'last_name' => 'Last name (newer)']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $this->woocommerceSegment->synchronizeCustomers(); $subscriber = Subscriber::where('wp_user_id', $user->ID)->findOne(); expect($subscriber->lastName)->equals('Last name (newer)'); @@ -253,13 +253,13 @@ class WooCommerceTest extends \MailPoetTest { public function testItRemovesRegisteredCustomersFromTrash() { $user = $this->insertRegisteredCustomer(); $this->woocommerceSegment->synchronizeCustomers(); - $subscriber = Subscriber::where("email", $user->userEmail) + $subscriber = Subscriber::where("email", $user->user_email) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps ->where('is_woocommerce_user', 1) ->findOne(); $subscriber->deletedAt = Carbon::now(); $subscriber->save(); $this->woocommerceSegment->synchronizeCustomers(); - $subscriber = Subscriber::where("email", $user->userEmail) + $subscriber = Subscriber::where("email", $user->user_email) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps ->where('is_woocommerce_user', 1) ->findOne(); expect($subscriber->deletedAt)->null(); @@ -306,7 +306,7 @@ class WooCommerceTest extends \MailPoetTest { $subscriber->hydrate([ 'first_name' => 'John', 'last_name' => 'John', - 'email' => $user->userEmail, + 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'wp_user_id' => $user->ID, ]); $subscriber->status = Subscriber::STATUS_UNCONFIRMED; @@ -432,7 +432,7 @@ class WooCommerceTest extends \MailPoetTest { $user2 = $this->insertRegisteredCustomer(); $subscriber1 = Subscriber::createOrUpdate([ - 'email' => $user1->userEmail, + 'email' => $user1->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'is_woocommerce_user' => 1, 'status' => Subscriber::STATUS_UNSUBSCRIBED, ]); @@ -443,7 +443,7 @@ class WooCommerceTest extends \MailPoetTest { $association1->save(); $subscriber2 = Subscriber::createOrUpdate([ - 'email' => $user2->userEmail, + 'email' => $user2->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'is_woocommerce_user' => 1, 'status' => Subscriber::STATUS_UNSUBSCRIBED, 'confirmed_ip' => '123', @@ -474,7 +474,7 @@ class WooCommerceTest extends \MailPoetTest { $user2 = $this->insertRegisteredCustomer(); $subscriber1 = Subscriber::createOrUpdate([ - 'email' => $user1->userEmail, + 'email' => $user1->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'is_woocommerce_user' => 1, 'status' => Subscriber::STATUS_SUBSCRIBED, ]); @@ -485,7 +485,7 @@ class WooCommerceTest extends \MailPoetTest { $association1->save(); $subscriber2 = Subscriber::createOrUpdate([ - 'email' => $user2->userEmail, + 'email' => $user2->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps 'is_woocommerce_user' => 1, 'status' => Subscriber::STATUS_SUBSCRIBED, 'confirmed_ip' => '123', @@ -607,7 +607,7 @@ class WooCommerceTest extends \MailPoetTest { // add customer role $user = new WPUserWithExtraProps($id); $user->add_role('customer'); - $this->userEmails[] = $user->userEmail; + $this->userEmails[] = $user->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps return $user; } @@ -631,7 +631,7 @@ class WooCommerceTest extends \MailPoetTest { $number = !is_null($number) ? (int)$number : mt_rand(); $user = $this->insertRegisteredCustomer($number); $data = is_array($data) ? $data : []; - $data['email'] = $user->userEmail; + $data['email'] = $user->user_email; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps $data['user_id'] = $user->ID; $user->orderId = $this->createOrder($data); return $user;