Skip to content

Upgrade to swiftmailer-6 #9791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
nickvergessen merged 6 commits into from
Jul 6, 2018
Merged

Upgrade to swiftmailer-6 #9791

nickvergessen merged 6 commits into from
Jul 6, 2018

Conversation

@rullzer
Copy link
Member

@rullzer rullzer commented Jun 7, 2018 •
edited
Loading

Requires:

Todo:

@rullzer rullzer added this to the Nextcloud 14 milestone Jun 7, 2018
@rullzer rullzer added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 7, 2018
@rullzer rullzer changed the title 3rdparty/noid/bump swiftmailer Upgreade to swiftmailer-6 Jun 8, 2018
@MorrisJobke
Copy link
Member

MorrisJobke commented Jun 8, 2018

Unit tests fail hard :/

@rullzer
Copy link
Member Author

rullzer commented Jun 8, 2018

Yeah need to fix those as well....

@codecov
Copy link

codecov bot commented Jun 8, 2018 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@c92fe76). Click here to learn what that means.
The diff coverage is 73.91%.

@@            Coverage Diff            @@
##             master    #9791   +/-   ##
=========================================
  Coverage          ?   31.71%           
  Complexity        ?    26020           
=========================================
  Files             ?     1661           
  Lines             ?    96178           
  Branches          ?     1291           
=========================================
  Hits              ?    30504           
  Misses            ?    65674           
  Partials          ?        0
Impacted Files Coverage Δ Complexity Δ
...tings/templates/settings/admin/additional-mail.php 0% <ø> (ø) 0 <0> (?)
config/config.sample.php 0% <0%> (ø) 0 <0> (?)
lib/private/Settings/Admin/Mail.php 88% <50%> (ø) 7 <0> (?)
core/js/setupchecks.js 80.27% <50%> (ø) 0 <0> (?)
settings/Controller/CheckSetupController.php 57.7% <50%> (ø) 77 <1> (?)
lib/private/Mail/Mailer.php 74.41% <92.85%> (ø) 27 <4> (?)

@rullzer rullzer force-pushed the 3rdparty/noid/bump_swiftmailer branch from 52ea2df to e9a6f7e Compare June 8, 2018 12:46
@mandree95 mandree95 mentioned this pull request Jun 14, 2018
Closed
@rullzer rullzer force-pushed the 3rdparty/noid/bump_swiftmailer branch 3 times, most recently from e2817c6 to bd3d9ab Compare June 19, 2018 18:35
@rullzer rullzer added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 19, 2018
@rullzer
Copy link
Member Author

rullzer commented Jun 20, 2018

Should be ready for review.

@rullzer rullzer force-pushed the 3rdparty/noid/bump_swiftmailer branch from bd3d9ab to b6bd2ae Compare June 20, 2018 15:19
@MorrisJobke
Copy link
Member

MorrisJobke commented Jun 21, 2018

Make sure this is in the release notes

Please add it to #7827

@MorrisJobke MorrisJobke mentioned this pull request Jun 25, 2018
Closed
@rullzer rullzer mentioned this pull request Jun 25, 2018
Closed
@rullzer
Copy link
Member Author

rullzer commented Jun 25, 2018

Done. lets get this in!

@MorrisJobke MorrisJobke changed the title Upgreade to swiftmailer-6 Upgrade to swiftmailer-6 Jun 25, 2018
MorrisJobke
MorrisJobke approved these changes Jun 25, 2018
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

nickvergessen
nickvergessen reviewed Jun 25, 2018
View reviewed changes
core/js/setupchecks.js Outdated
messages.push({
msg: t(
'core',
'Use of the the built in php mailer is no longer supported. Please update your e-mail settings.'
Copy link
Member

@nickvergessen nickvergessen Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would use a different term then "your email settings", otherwise the admin might be confused and check their personal settings.

Copy link
Member Author

@rullzer rullzer Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

nickvergessen
nickvergessen reviewed Jun 25, 2018
View reviewed changes
settings/Controller/CheckSetupController.php Outdated
}

protected function isPhpMailerUsed(): bool {
return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php';
Copy link
Member

@nickvergessen nickvergessen Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default was php, so if it is not set, it used to do php and should also show the warning?

Copy link
Member

@MorrisJobke MorrisJobke Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new default is smtp ;)

Copy link
Member

@nickvergessen nickvergessen Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exactly, but smtp requires settings, if they are not there emails fail all of a sudden and you dont get a warning because you used the default, so you get "smtp" now and the warning is not displayed

Copy link
Member

@MorrisJobke MorrisJobke Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah - got it. Yes this need to be changed to php.

Copy link
Member Author

@rullzer rullzer Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!

Copy link
Member Author

@rullzer rullzer Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@rullzer rullzer force-pushed the 3rdparty/noid/bump_swiftmailer branch from b6bd2ae to b379bd3 Compare June 25, 2018 18:23
nickvergessen
nickvergessen reviewed Jun 26, 2018
View reviewed changes
core/js/setupchecks.js Outdated
messages.push({
msg: t(
'core',
'Use of the the built in php mailer is no longer supported. Please update your email server settings.'
Copy link
Member

@nickvergessen nickvergessen Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could also add a link to the settings, because the messages seem to support html.
Also text suggestion to make clear it's not about the mail server:
Please update the email configuration in the <linky>basic settings<linky>.

Copy link
Member Author

@rullzer rullzer Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point. Will take care later

Copy link
Member Author

@rullzer rullzer Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aaah mmm I'm not sure if we can directly link to settings :S

Copy link
Member Author

@rullzer rullzer Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok added

@rullzer rullzer force-pushed the 3rdparty/noid/bump_swiftmailer branch from b379bd3 to 2a5b1ae Compare June 26, 2018 14:23
rullzer added 6 commits July 4, 2018 08:28
@rullzer
[3rdparty] Bump swiftmailer 6.0.2
65bcef8 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Kill php mail from settings
0dd4a3e 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Make swift 6 compatible
e6e6b56 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Swift to \Swift_Mailer as abstraction
be7db15 
* \Swift_Mailer handles starting the transport etc properly
* Fixed tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Fix settings tests
0cf0bcb 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Add warning to setup checks if the default mailer is still php
6a0c54d 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer force-pushed the 3rdparty/noid/bump_swiftmailer branch from 2a5b1ae to 6a0c54d Compare July 4, 2018 06:28
@rullzer
Copy link
Member Author

rullzer commented Jul 4, 2018

@nickvergessen 👍 ??

nickvergessen
nickvergessen approved these changes Jul 6, 2018
View reviewed changes
Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works

@nickvergessen nickvergessen merged commit 3ade347 into master Jul 6, 2018
@nickvergessen nickvergessen deleted the 3rdparty/noid/bump_swiftmailer branch July 6, 2018 08:39
@kesselb kesselb mentioned this pull request Sep 10, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@nickvergessen nickvergessen nickvergessen approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@blizzz blizzz Awaiting requested review from blizzz

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees

No one assigned

Labels

3. to review Waiting for reviews enhancement technical debt

Projects

None yet

Milestone

Nextcloud 14

Development

Successfully merging this pull request may close these issues.

4 participants

@rullzer @MorrisJobke @nickvergessen