From d219213dfea9aa0ad5287fb41f21ab067b7e3775 Mon Sep 17 00:00:00 2001
From: Bradley Taylor <hello@brad-taylor.co.uk>
Date: Fri, 30 Dec 2022 13:51:21 +0000
Subject: [PATCH] [REF][PHP8.2] Avoid dynamic properties in mailstores

---
 CRM/Mailing/MailStore.php          | 10 +++++++++-
 CRM/Mailing/MailStore/Imap.php     | 14 ++++++++++++++
 CRM/Mailing/MailStore/Localdir.php | 23 ++++++++++++++++++++++-
 CRM/Mailing/MailStore/Maildir.php  | 23 ++++++++++++++++++++++-
 CRM/Mailing/MailStore/Mbox.php     | 21 +++++++++++++++++++++
 CRM/Mailing/MailStore/Pop3.php     | 14 ++++++++++++++
 6 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/CRM/Mailing/MailStore.php b/CRM/Mailing/MailStore.php
index 8d6f0061cd..13626fcf1c 100644
--- a/CRM/Mailing/MailStore.php
+++ b/CRM/Mailing/MailStore.php
@@ -16,11 +16,19 @@
  */
 class CRM_Mailing_MailStore {
   /**
-   * flag to decide whether to print debug messages
+   * Flag to decide whether to print debug messages
+   *
    * @var bool
    */
   public $_debug = FALSE;
 
+  /**
+   * Holds the underlying mailbox transport implementation
+   *
+   * @var ezcMailImapTransport|ezcMailMboxTransport|ezcMailPop3Transport|null
+   */
+  protected $_transport;
+
   /**
    * Return the proper mail store implementation, based on config settings.
    *
diff --git a/CRM/Mailing/MailStore/Imap.php b/CRM/Mailing/MailStore/Imap.php
index c24943e2db..718dc8c067 100644
--- a/CRM/Mailing/MailStore/Imap.php
+++ b/CRM/Mailing/MailStore/Imap.php
@@ -20,6 +20,20 @@
  */
 class CRM_Mailing_MailStore_Imap extends CRM_Mailing_MailStore {
 
+  /**
+   * Path to a IMAP directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_ignored;
+
+  /**
+   * Path to a IMAP directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_processed;
+
   /**
    * Connect to the supplied IMAP server and make sure the two mailboxes exist.
    *
diff --git a/CRM/Mailing/MailStore/Localdir.php b/CRM/Mailing/MailStore/Localdir.php
index 3bacc73f16..5cdc3bd7c5 100644
--- a/CRM/Mailing/MailStore/Localdir.php
+++ b/CRM/Mailing/MailStore/Localdir.php
@@ -20,11 +20,32 @@
  */
 class CRM_Mailing_MailStore_Localdir extends CRM_Mailing_MailStore {
 
+  /**
+   * Directory to operate upon.
+   *
+   * @var string
+   */
+  private $_dir;
+
+  /**
+   * Path to a local directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_ignored;
+
+  /**
+   * Path to a local directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_processed;
+
   /**
    * Connect to the supplied dir and make sure the two mail dirs exist.
    *
    * @param string $dir
-   *   Dir to operate upon.
+   *   Directory to operate upon.
    *
    * @return \CRM_Mailing_MailStore_Localdir
    */
diff --git a/CRM/Mailing/MailStore/Maildir.php b/CRM/Mailing/MailStore/Maildir.php
index 32c0f54b28..8668ce12e6 100644
--- a/CRM/Mailing/MailStore/Maildir.php
+++ b/CRM/Mailing/MailStore/Maildir.php
@@ -20,11 +20,32 @@
  */
 class CRM_Mailing_MailStore_Maildir extends CRM_Mailing_MailStore {
 
+  /**
+   * Directory to operate upon.
+   *
+   * @var string
+   */
+  private $_dir;
+
+  /**
+   * Path to a local directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_ignored;
+
+  /**
+   * Path to a local directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_processed;
+
   /**
    * Connect to the supplied dir and make sure the two mail dirs exist.
    *
    * @param string $dir
-   *   Dir to operate upon.
+   *   Directory to operate upon.
    *
    * @return \CRM_Mailing_MailStore_Maildir
    */
diff --git a/CRM/Mailing/MailStore/Mbox.php b/CRM/Mailing/MailStore/Mbox.php
index ea2fa6196d..d2f11f4348 100644
--- a/CRM/Mailing/MailStore/Mbox.php
+++ b/CRM/Mailing/MailStore/Mbox.php
@@ -20,6 +20,27 @@
  */
 class CRM_Mailing_MailStore_Mbox extends CRM_Mailing_MailStore {
 
+  /**
+   * Path to a local directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_ignored;
+
+  /**
+   * Path to a local directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_processed;
+
+  /**
+   * Count of messages left to process
+   *
+   * @var int
+   */
+  private $_leftToProcess;
+
   /**
    * Connect to and lock the supplied file and make sure the two mail dirs exist.
    *
diff --git a/CRM/Mailing/MailStore/Pop3.php b/CRM/Mailing/MailStore/Pop3.php
index 9c38446cd5..716023417c 100644
--- a/CRM/Mailing/MailStore/Pop3.php
+++ b/CRM/Mailing/MailStore/Pop3.php
@@ -20,6 +20,20 @@
  */
 class CRM_Mailing_MailStore_Pop3 extends CRM_Mailing_MailStore {
 
+  /**
+   * Path to a local directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_ignored;
+
+  /**
+   * Path to a local directory to store ignored emails
+   *
+   * @var string
+   */
+  private $_processed;
+
   /**
    * Connect to the supplied POP3 server and make sure the two mail dirs exist
    *
-- 
2.25.1