]> source.dussan.org Git - nextcloud-server.git/commit
Migrate to SwiftMail
authorLukas Reschke <lukas@owncloud.com>
Thu, 12 Feb 2015 12:53:27 +0000 (13:53 +0100)
committerLukas Reschke <lukas@owncloud.com>
Mon, 16 Mar 2015 11:47:05 +0000 (12:47 +0100)
commit13486a5ada62e4355473ca01e07371c162951e84
treec079e9c53691ca14e5e1898c40a93322d6e727f5
parent0d9f149dd93997085b85e2b174f5989a1b996263
Migrate to SwiftMail

Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
3rdparty
lib/private/server.php
lib/public/iservercontainer.php
tests/lib/mail.php
tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
3rdparty
lib/private/mail.php
lib/private/server.php
lib/public/iservercontainer.php
settings/ajax/lostpassword.php
settings/application.php
20 files changed:
3rdparty
core/lostpassword/controller/lostcontroller.php
lib/private/mail.php [deleted file]
lib/private/mail/mailer.php [new file with mode: 0644]
lib/private/mail/message.php [new file with mode: 0644]
lib/private/mail/util.php [new file with mode: 0644]
lib/private/server.php
lib/public/iservercontainer.php
lib/public/mail/imailer.php [new file with mode: 0644]
lib/public/mail/util.php [new file with mode: 0644]
lib/public/util.php
settings/application.php
settings/controller/mailsettingscontroller.php
settings/controller/userscontroller.php
tests/lib/mail.php [deleted file]
tests/lib/mail/mailer.php [new file with mode: 0644]
tests/lib/mail/message.php [new file with mode: 0644]
tests/lib/mail/util.php [new file with mode: 0644]
tests/settings/controller/mailsettingscontrollertest.php
tests/settings/controller/userscontrollertest.php