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.

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

[5.2] Add stream_options to config #13715

Merged
merged 2 commits into from
May 26, 2016
Merged

[5.2] Add stream_options to config #13715

merged 2 commits into from
May 26, 2016

Conversation

splitice
Copy link
Contributor

Swiftmailer has now been updated to include an option for setting the stream options. This is required in newer PHP versions for dealing with unsigned certificates.

This adds a configuration option stream_options.

@GrahamCampbell GrahamCampbell changed the title Add stream_options to config [5.2] Add stream_options to config May 26, 2016
@GrahamCampbell
Copy link
Member

Looks ok to me.

@GrahamCampbell
Copy link
Member

It'll need a matching PR to laravel/laravel though.

@@ -46,6 +46,10 @@ protected function createSmtpDriver()
$transport->setPassword($config['password']);
}

if (isset($config['stream_options'])) {
Copy link
Member

Choose a reason for hiding this comment

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

I'd rather avoid having an underscore if at all possible.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

feel free to adjust as you wish

@taylorotwell taylorotwell merged commit 891bfc8 into laravel:5.2 May 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants