Skip to content
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

Resolves Issue #986 - Turn off opportunistic TLS when disabled. #987

Merged
merged 5 commits into from
Jun 13, 2019
Merged

Resolves Issue #986 - Turn off opportunistic TLS when disabled. #987

merged 5 commits into from
Jun 13, 2019

Conversation

xrobau
Copy link
Contributor

@xrobau xrobau commented May 30, 2019

This ensures that when you have disabled 'secure' in your mail
config no TLS attempts are ... attempted.

This is because PHPMailer requires a valid Certificate, which
may not always be available. See:
https://github.com/PHPMailer/PHPMailer/blob/master/src/PHPMailer.php#L282

Signed-Off-By: Rob Thomas xrobau@gmail.com

@xrobau
Resolves Issue userfrosting#986 - Turn off opportunistic TLS when dis…
a071817 
…abled.

This ensures that when you have disabled 'secure' in your mail
config no TLS attempts are ... attempted.

This is because PHPMailer requires a valid Certificate, which
may not always be available.  See:
   https://github.com/PHPMailer/PHPMailer/blob/master/src/PHPMailer.php#L282

Signed-Off-By: Rob Thomas <xrobau@gmail.com>
@codecov
Copy link

codecov bot commented May 30, 2019 •
edited
Loading

Codecov Report

Merging #987 into hotfix will increase coverage by <.01%.
The diff coverage is 50%.

Impacted file tree graph

@@             Coverage Diff              @@
##             hotfix     #987      +/-   ##
============================================
+ Coverage      68.2%   68.21%   +<.01%     
- Complexity     2137     2140       +3     
============================================
  Files           159      159              
  Lines          7241     7245       +4     
============================================
+ Hits           4939     4942       +3     
- Misses         2302     2303       +1
Impacted Files Coverage Δ Complexity Δ
app/sprinkles/core/src/Mail/Mailer.php 37.17% <50%> (+0.33%) 27 <0> (+1) ⬆️
...rinkles/account/src/Authenticate/Authenticator.php 92.98% <0%> (+0.12%) 41% <0%> (+2%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9c9ae30...6950b0e. Read the comment docs.

@lcharette lcharette changed the base branch from master to hotfix May 30, 2019 15:50
lcharette
lcharette requested changes May 30, 2019
View reviewed changes
Copy link
Member

@lcharette lcharette left a comment

Choose a reason for hiding this comment

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

Should we add a note here about the possible value this config can have ?

https://github.com/userfrosting/UserFrosting/blob/master/app/sprinkles/core/config/default.php#L213

@lcharette lcharette self-assigned this May 30, 2019
@lcharette lcharette added mail Email related possible bug We suspect something isn't working labels May 30, 2019
@lcharette lcharette added this to the 4.2.x milestone May 30, 2019
@lcharette lcharette merged commit d1221b9 into userfrosting:hotfix Jun 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcharette lcharette lcharette requested changes

Assignees

@lcharette lcharette

Labels
mail Email related possible bug We suspect something isn't working
Projects
None yet
Milestone
4.2.x
Development

Successfully merging this pull request may close these issues.
2 participants
@xrobau @lcharette