From ccee4da2b749a2646b189f0e4aeb773728fd332e Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 13 Aug 2015 21:13:11 -0700 Subject: [PATCH] ezc - Remove stale file references. Rely on autoloader. --- CRM/Mailing/Event/BAO/Reply.php | 3 --- CRM/Mailing/MailStore/Imap.php | 3 --- CRM/Mailing/MailStore/Localdir.php | 3 --- CRM/Mailing/MailStore/Maildir.php | 3 --- CRM/Mailing/MailStore/Mbox.php | 3 --- CRM/Mailing/MailStore/Pop3.php | 3 --- CRM/Utils/Mail/Incoming.php | 3 --- tests/phpunit/CiviTest/CiviMailUtils.php | 3 --- tests/phpunit/WebTest/Activity/IcalTest.php | 2 -- tests/phpunit/WebTest/Mailing/SpoolTest.php | 2 -- 10 files changed, 28 deletions(-) diff --git a/CRM/Mailing/Event/BAO/Reply.php b/CRM/Mailing/Event/BAO/Reply.php index bd2f8f5f1c..a533938641 100644 --- a/CRM/Mailing/Event/BAO/Reply.php +++ b/CRM/Mailing/Event/BAO/Reply.php @@ -33,9 +33,6 @@ require_once 'Mail/mime.php'; -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; - /** * Class CRM_Mailing_Event_BAO_Reply */ diff --git a/CRM/Mailing/MailStore/Imap.php b/CRM/Mailing/MailStore/Imap.php index f40ef3d664..b07ea2b1ea 100644 --- a/CRM/Mailing/MailStore/Imap.php +++ b/CRM/Mailing/MailStore/Imap.php @@ -31,9 +31,6 @@ * @copyright CiviCRM LLC (c) 2004-2015 */ -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; - /** * Class CRM_Mailing_MailStore_Imap */ diff --git a/CRM/Mailing/MailStore/Localdir.php b/CRM/Mailing/MailStore/Localdir.php index a2a08a4d38..42bd18bb66 100644 --- a/CRM/Mailing/MailStore/Localdir.php +++ b/CRM/Mailing/MailStore/Localdir.php @@ -31,9 +31,6 @@ * @copyright CiviCRM LLC (c) 2004-2015 */ -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; - /** * Class CRM_Mailing_MailStore_Localdir */ diff --git a/CRM/Mailing/MailStore/Maildir.php b/CRM/Mailing/MailStore/Maildir.php index 5a00f290ae..c8fc360e1f 100644 --- a/CRM/Mailing/MailStore/Maildir.php +++ b/CRM/Mailing/MailStore/Maildir.php @@ -31,9 +31,6 @@ * @copyright CiviCRM LLC (c) 2004-2015 */ -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; - /** * Class CRM_Mailing_MailStore_Maildir */ diff --git a/CRM/Mailing/MailStore/Mbox.php b/CRM/Mailing/MailStore/Mbox.php index 75d1490d55..d7dd47b0f5 100644 --- a/CRM/Mailing/MailStore/Mbox.php +++ b/CRM/Mailing/MailStore/Mbox.php @@ -31,9 +31,6 @@ * @copyright CiviCRM LLC (c) 2004-2015 */ -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; - /** * Class CRM_Mailing_MailStore_Mbox */ diff --git a/CRM/Mailing/MailStore/Pop3.php b/CRM/Mailing/MailStore/Pop3.php index c31febfe44..68d40e9ede 100644 --- a/CRM/Mailing/MailStore/Pop3.php +++ b/CRM/Mailing/MailStore/Pop3.php @@ -31,9 +31,6 @@ * @copyright CiviCRM LLC (c) 2004-2015 */ -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; - /** * Class CRM_Mailing_MailStore_Pop3 */ diff --git a/CRM/Utils/Mail/Incoming.php b/CRM/Utils/Mail/Incoming.php index 5550706803..6c536b8323 100644 --- a/CRM/Utils/Mail/Incoming.php +++ b/CRM/Utils/Mail/Incoming.php @@ -282,9 +282,6 @@ class CRM_Utils_Mail_Incoming { )); } - require_once 'ezc/Base/src/ezc_bootstrap.php'; - require_once 'ezc/autoload/mail_autoload.php'; - // explode email to digestable format $set = new ezcMailFileSet(array($file)); $parser = new ezcMailParser(); diff --git a/tests/phpunit/CiviTest/CiviMailUtils.php b/tests/phpunit/CiviTest/CiviMailUtils.php index 854974f185..ffe589927f 100644 --- a/tests/phpunit/CiviTest/CiviMailUtils.php +++ b/tests/phpunit/CiviTest/CiviMailUtils.php @@ -40,9 +40,6 @@ * @package CiviCRM */ -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; - /** * Class CiviMailUtils */ diff --git a/tests/phpunit/WebTest/Activity/IcalTest.php b/tests/phpunit/WebTest/Activity/IcalTest.php index 5736abb6df..8d594d3be2 100644 --- a/tests/phpunit/WebTest/Activity/IcalTest.php +++ b/tests/phpunit/WebTest/Activity/IcalTest.php @@ -26,8 +26,6 @@ require_once 'CiviTest/CiviSeleniumTestCase.php'; require_once 'CiviTest/CiviMailUtils.php'; -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; /** * Class WebTest_Activity_IcalTest diff --git a/tests/phpunit/WebTest/Mailing/SpoolTest.php b/tests/phpunit/WebTest/Mailing/SpoolTest.php index c7223a8804..0dbca52b6e 100644 --- a/tests/phpunit/WebTest/Mailing/SpoolTest.php +++ b/tests/phpunit/WebTest/Mailing/SpoolTest.php @@ -26,8 +26,6 @@ require_once 'CiviTest/CiviSeleniumTestCase.php'; require_once 'CiviTest/CiviMailUtils.php'; -require_once 'ezc/Base/src/ezc_bootstrap.php'; -require_once 'ezc/autoload/mail_autoload.php'; /** * Class WebTest_Mailing_SpoolTest -- 2.25.1