Fix properties with trailing underscore

[MAILPOET-2715]

lib/Models/CustomField.php

@@ -12,7 +12,7 @@ use MailPoet\WP\Functions as WPFunctions;
  */
 
 class CustomField extends Model {
-  public static $_table = MP_CUSTOM_FIELDS_TABLE;
+  public static $_table = MP_CUSTOM_FIELDS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
   const TYPE_DATE = 'date';
   const TYPE_TEXT = 'text';
   const TYPE_TEXTAREA = 'textarea';

lib/Models/DynamicSegmentFilter.php

@@ -12,7 +12,7 @@ use MailPoet\WP\Functions as WPFunctions;
  */
 class DynamicSegmentFilter extends Model {
 
-  public static $_table = MP_DYNAMIC_SEGMENTS_FILTERS_TABLE;
+  public static $_table = MP_DYNAMIC_SEGMENTS_FILTERS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public function save() {
     if (is_null($this->filterData)) {

lib/Models/Form.php

@@ -12,7 +12,7 @@ use MailPoet\WP\Functions as WPFunctions;
  */
 
 class Form extends Model {
-  public static $_table = MP_FORMS_TABLE;
+  public static $_table = MP_FORMS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public function getSettings() {
     return WPFunctions::get()->isSerialized($this->settings) ? unserialize($this->settings) : $this->settings;

lib/Models/Log.php

@@ -3,6 +3,6 @@
 namespace MailPoet\Models;
 
 class Log extends Model {
-  public static $_table = MP_LOG_TABLE;
+  public static $_table = MP_LOG_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
 }

lib/Models/MappingToExternalEntities.php

@@ -3,7 +3,7 @@
 namespace MailPoet\Models;
 
 class MappingToExternalEntities extends Model {
-  public static $_table = MP_MAPPING_TO_EXTERNAL_ENTITIES_TABLE;
+  public static $_table = MP_MAPPING_TO_EXTERNAL_ENTITIES_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function create($data = []) {
     $relation = parent::create();

lib/Models/Model.php

@@ -133,8 +133,8 @@ use MailPoet\WP\Functions as WPFunctions;
 class Model extends \MailPoetVendor\Sudzy\ValidModel {
   const DUPLICATE_RECORD = 23000;
 
-  public static $_table;
+  public static $_table; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-  protected $_errors;
+  protected $_errors; // phpcs:ignore PSR2.Classes.PropertyDeclaration
   protected $newRecord;
 
   public function __construct() {

lib/Models/Newsletter.php

@@ -45,7 +45,7 @@ use function MailPoetVendor\array_column;
  */
 
 class Newsletter extends Model {
-  public static $_table = MP_NEWSLETTERS_TABLE;
+  public static $_table = MP_NEWSLETTERS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
   const TYPE_AUTOMATIC = NewsletterEntity::TYPE_AUTOMATIC;
   const TYPE_STANDARD = NewsletterEntity::TYPE_STANDARD;
   const TYPE_WELCOME = NewsletterEntity::TYPE_WELCOME;

lib/Models/NewsletterLink.php

@@ -10,6 +10,6 @@ namespace MailPoet\Models;
  * @property int|null $clicksCount
  */
 class NewsletterLink extends Model {
-  public static $_table = MP_NEWSLETTER_LINKS_TABLE;
+  public static $_table = MP_NEWSLETTER_LINKS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
   const UNSUBSCRIBE_LINK_SHORT_CODE = '[link:subscription_unsubscribe_url]';
 }

lib/Models/NewsletterOption.php

@@ -9,7 +9,7 @@ namespace MailPoet\Models;
  * @property string $updatedAt
  */
 class NewsletterOption extends Model {
-  public static $_table = MP_NEWSLETTER_OPTION_TABLE;
+  public static $_table = MP_NEWSLETTER_OPTION_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function createOrUpdate($data = []) {
     if (!is_array($data) || empty($data['newsletter_id']) || empty($data['option_field_id'])) {

lib/Models/NewsletterOptionField.php

@@ -10,7 +10,7 @@ use MailPoet\WP\Functions as WPFunctions;
  */
 
 class NewsletterOptionField extends Model {
-  public static $_table = MP_NEWSLETTER_OPTION_FIELDS_TABLE;
+  public static $_table = MP_NEWSLETTER_OPTION_FIELDS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public function __construct() {
     parent::__construct();

lib/Models/NewsletterPost.php

@@ -8,7 +8,7 @@ namespace MailPoet\Models;
  * @property string $updatedAt
  */
 class NewsletterPost extends Model {
-  public static $_table = MP_NEWSLETTER_POSTS_TABLE;
+  public static $_table = MP_NEWSLETTER_POSTS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function getNewestNewsletterPost($newsletterId) {
     return self::where('newsletter_id', $newsletterId)

lib/Models/NewsletterSegment.php

@@ -8,5 +8,5 @@ namespace MailPoet\Models;
  * @property string $updatedAt
  */
 class NewsletterSegment extends Model {
-  public static $_table = MP_NEWSLETTER_SEGMENT_TABLE;
+  public static $_table = MP_NEWSLETTER_SEGMENT_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 }

lib/Models/NewsletterTemplate.php

@@ -14,7 +14,7 @@ use MailPoet\WP\Functions as WPFunctions;
  * @property int|null $readonly
  */
 class NewsletterTemplate extends Model {
-  public static $_table = MP_NEWSLETTER_TEMPLATES_TABLE;
+  public static $_table = MP_NEWSLETTER_TEMPLATES_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   const RECENTLY_SENT_CATEGORIES = '["recent"]';
   const RECENTLY_SENT_COUNT = 12;

lib/Models/ScheduledTask.php

@@ -20,7 +20,7 @@ use MailPoetVendor\Idiorm\ORM;
  * @property string|array|null $meta
  */
 class ScheduledTask extends Model {
-  public static $_table = MP_SCHEDULED_TASKS_TABLE;
+  public static $_table = MP_SCHEDULED_TASKS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
   const STATUS_COMPLETED = ScheduledTaskEntity::STATUS_COMPLETED;
   const STATUS_SCHEDULED = ScheduledTaskEntity::STATUS_SCHEDULED;
   const STATUS_PAUSED = ScheduledTaskEntity::STATUS_PAUSED;

lib/Models/ScheduledTaskSubscriber.php

@@ -22,8 +22,8 @@ class ScheduledTaskSubscriber extends Model {
   const SENDING_STATUS_FAILED = 'failed';
   const SENDING_STATUS_UNPROCESSED = 'unprocessed';
 
-  public static $_table = MP_SCHEDULED_TASK_SUBSCRIBERS_TABLE;
+  public static $_table = MP_SCHEDULED_TASK_SUBSCRIBERS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-  public static $_id_column = ['task_id', 'subscriber_id']; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+  public static $_id_column = ['task_id', 'subscriber_id']; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps,PSR2.Classes.PropertyDeclaration
 
   public function task() {
     return $this->hasOne(__NAMESPACE__ . '\ScheduledTask', 'id', 'task_id');

lib/Models/Segment.php

@@ -17,7 +17,7 @@ use MailPoet\WP\Functions as WPFunctions;
  */
 
 class Segment extends Model {
-  public static $_table = MP_SEGMENTS_TABLE;
+  public static $_table = MP_SEGMENTS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
   const TYPE_WP_USERS = SegmentEntity::TYPE_WP_USERS;
   const TYPE_WC_USERS = SegmentEntity::TYPE_WC_USERS;
   const TYPE_DEFAULT = SegmentEntity::TYPE_DEFAULT;

lib/Models/SendingQueue.php

@@ -23,7 +23,7 @@ use MailPoet\WP\Functions as WPFunctions;
  */
 
 class SendingQueue extends Model {
-  public static $_table = MP_SENDING_QUEUES_TABLE;
+  public static $_table = MP_SENDING_QUEUES_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
   const STATUS_COMPLETED = SendingQueueEntity::STATUS_COMPLETED;
   const STATUS_SCHEDULED = SendingQueueEntity::STATUS_SCHEDULED;
   const STATUS_PAUSED = SendingQueueEntity::STATUS_PAUSED;

lib/Models/StatisticsClicks.php

@@ -12,7 +12,7 @@ use DateTimeInterface;
  * @property int $count
  */
 class StatisticsClicks extends Model {
-  public static $_table = MP_STATISTICS_CLICKS_TABLE;
+  public static $_table = MP_STATISTICS_CLICKS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function createOrUpdateClickCount($linkId, $subscriberId, $newsletterId, $queueId) {
     $statistics = self::where('link_id', $linkId)

lib/Models/StatisticsForms.php

@@ -3,7 +3,7 @@
 namespace MailPoet\Models;
 
 class StatisticsForms extends Model {
-  public static $_table = MP_STATISTICS_FORMS_TABLE;
+  public static $_table = MP_STATISTICS_FORMS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function getTotalSignups($formId = false) {
     return self::where('form_id', $formId)->count();

lib/Models/StatisticsNewsletters.php

@@ -6,7 +6,7 @@ namespace MailPoet\Models;
  * @property string|null $sentAt
  */
 class StatisticsNewsletters extends Model {
-  public static $_table = MP_STATISTICS_NEWSLETTERS_TABLE;
+  public static $_table = MP_STATISTICS_NEWSLETTERS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function createMultiple(array $data) {
     $values = [];

lib/Models/StatisticsOpens.php

@@ -8,7 +8,7 @@ namespace MailPoet\Models;
  * @property int $queueId
  */
 class StatisticsOpens extends Model {
-  public static $_table = MP_STATISTICS_OPENS_TABLE;
+  public static $_table = MP_STATISTICS_OPENS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function getOrCreate($subscriberId, $newsletterId, $queueId) {
     $statistics = self::where('subscriber_id', $subscriberId)

lib/Models/StatisticsUnsubscribes.php

@@ -8,7 +8,7 @@ namespace MailPoet\Models;
  * @property int $queueId
  */
 class StatisticsUnsubscribes extends Model {
-  public static $_table = MP_STATISTICS_UNSUBSCRIBES_TABLE;
+  public static $_table = MP_STATISTICS_UNSUBSCRIBES_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function getOrCreate($subscriberId, $newsletterId, $queueId) {
     $statistics = self::where('subscriber_id', $subscriberId)

lib/Models/StatisticsWooCommercePurchases.php

@@ -14,7 +14,7 @@ use WC_Order;
  * @property float $orderPriceTotal
  */
 class StatisticsWooCommercePurchases extends Model {
-  public static $_table = MP_STATISTICS_WOOCOMMERCE_PURCHASES_TABLE;
+  public static $_table = MP_STATISTICS_WOOCOMMERCE_PURCHASES_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function createOrUpdateByClickDataAndOrder(StatisticsClicks $click, WC_Order $order) {
     // search by subscriber and newsletter IDs (instead of click itself) to avoid duplicities

lib/Models/Subscriber.php

@@ -32,7 +32,7 @@ use function MailPoetVendor\array_column;
  */
 
 class Subscriber extends Model {
-  public static $_table = MP_SUBSCRIBERS_TABLE;
+  public static $_table = MP_SUBSCRIBERS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   const STATUS_SUBSCRIBED = 'subscribed';
   const STATUS_UNSUBSCRIBED = 'unsubscribed';

lib/Models/SubscriberCustomField.php

@@ -12,7 +12,7 @@ use function MailPoetVendor\array_column;
  * @property string $value
  */
 class SubscriberCustomField extends Model {
-  public static $_table = MP_SUBSCRIBER_CUSTOM_FIELD_TABLE;
+  public static $_table = MP_SUBSCRIBER_CUSTOM_FIELD_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public static function createOrUpdate($data = []) {
     $customField = CustomField::findOne($data['custom_field_id']);

lib/Models/SubscriberIP.php

@@ -6,5 +6,5 @@ namespace MailPoet\Models;
  * @property string $ip
  */
 class SubscriberIP extends Model {
-  public static $_table = MP_SUBSCRIBER_IPS_TABLE;
+  public static $_table = MP_SUBSCRIBER_IPS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 }

lib/Models/SubscriberSegment.php

@@ -10,7 +10,7 @@ namespace MailPoet\Models;
  */
 
 class SubscriberSegment extends Model {
-  public static $_table = MP_SUBSCRIBER_SEGMENT_TABLE;
+  public static $_table = MP_SUBSCRIBER_SEGMENT_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
   public function subscriber() {
     return $this->has_one(__NAMESPACE__ . '\Subscriber', 'id', 'subscriber_id');

lib/Settings/Hosts.php

@@ -3,7 +3,7 @@
 namespace MailPoet\Settings;
 
 class Hosts {
-  private static $_smtp = [
+  private static $smtp = [
     'AmazonSES' => [
       'name' => 'Amazon SES',
       'emails' => 100,
@@ -29,7 +29,7 @@ class Hosts {
     ],
   ];
 
-  private static $_web = [
+  private static $web = [
     '1and1' => [
         'name' => '1and1',
         'emails' => 30,
@@ -213,10 +213,10 @@ class Hosts {
   ];
 
   public static function getWebHosts() {
-    return static::$_web;
+    return static::$web;
   }
 
   public static function getSMTPHosts() {
-    return static::$_smtp;
+    return static::$smtp;
   }
 }

lib/Twig/Assets.php

@@ -8,10 +8,10 @@ use MailPoetVendor\Twig\TwigFunction;
 
 class Assets extends AbstractExtension {
   const CDN_URL = 'https://ps.w.org/mailpoet/';
-  private $_globals;
+  private $globals;
 
   public function __construct($globals) {
-    $this->_globals = $globals;
+    $this->globals = $globals;
   }
 
   public function getFunctions() {
@@ -51,8 +51,8 @@ class Assets extends AbstractExtension {
     foreach ($stylesheets as $stylesheet) {
       $output[] = sprintf(
         '<link rel="stylesheet" type="text/css" href="%s/dist/css/%s" />',
-        $this->_globals['assets_url'],
+        $this->globals['assets_url'],
-        $this->getAssetFilename($this->_globals['assets_manifest_css'], $stylesheet)
+        $this->getAssetFilename($this->globals['assets_manifest_css'], $stylesheet)
       );
     }
 
@@ -76,20 +76,20 @@ class Assets extends AbstractExtension {
   public function getJavascriptScriptUrl($script) {
     return sprintf(
       '%s/%s/%s',
-      $this->_globals['assets_url'],
+      $this->globals['assets_url'],
       strpos($script, 'lib/') === 0 ? 'js' : 'dist/js',
-      $this->getAssetFileName($this->_globals['assets_manifest_js'], $script)
+      $this->getAssetFileName($this->globals['assets_manifest_js'], $script)
     );
   }
 
   public function generateImageUrl($path) {
     return $this->appendVersionToUrl(
-      $this->_globals['assets_url'] . '/img/' . $path
+      $this->globals['assets_url'] . '/img/' . $path
     );
   }
 
   public function appendVersionToUrl($url) {
-    return WPFunctions::get()->addQueryArg('mailpoet_version', $this->_globals['version'], $url);
+    return WPFunctions::get()->addQueryArg('mailpoet_version', $this->globals['version'], $url);
   }
 
   public function getAssetFileName($manifest, $asset) {
@@ -98,6 +98,6 @@ class Assets extends AbstractExtension {
 
   public function generateCdnUrl($path) {
     $useCdn = defined('MAILPOET_USE_CDN') ? MAILPOET_USE_CDN : true;
-    return ($useCdn ? self::CDN_URL : $this->_globals['base_url'] . '/plugin_repository/') . "assets/$path";
+    return ($useCdn ? self::CDN_URL : $this->globals['base_url'] . '/plugin_repository/') . "assets/$path";
   }
 }