deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adding check for a valid encryption context to MailerFactory.

Browse source
This commit is contained in:
James Inman 2014-10-15 10:55:09 +01:00 committed by Dan Cryer
parent 980cc147ac
commit 3172b0f1d8
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
PHPCI/Helper/MailerFactory.php
View file

@ -28,11 +28,19 @@ class MailerFactory
*/
public function getSwiftMailerFromConfig()
{
$encryptionType = $this->getMailConfig('smtp_encryption');
// Workaround issue where smtp_encryption could == 1 in the past by
// checking it is a valid transport
if ($encryptionType && !in_array($encryptionType, stream_get_transports())) {
$encryptionType = null;
}
/** @var \Swift_SmtpTransport $transport */
$transport = \Swift_SmtpTransport::newInstance(
$this->getMailConfig('smtp_address'),
$this->getMailConfig('smtp_port'),
$this->getMailConfig('smtp_encryption')
$encryptionType
);
$transport->setUsername($this->getMailConfig('smtp_username'));
$transport->setPassword($this->getMailConfig('smtp_password'));