Merge pull request #25243 from braders/php82_mailbox_dynamic_properties

[REF][PHP8.2] Avoid dynamic properties in mailstores
civicrm · Dec 30, 2022 · 77b8cc9 · 77b8cc9
2 parents 7bd5c7c + d219213
commit 77b8cc9
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
    *