composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 09:08:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source
This commit is contained in:
Pierre Goiffon
2022-05-03 10:52:01 +02:00
parent 84e35e27b8 b348e0ff27
commit 867cc6ce7e
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/email.class.inc.php
View File

@@ -58,7 +58,7 @@ class EMail
public function __construct()
{
$this->m_aData = array();
$this->m_oMessage = Swift_Message::newInstance();
$this->m_oMessage = new Swift_Message();
$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
}
@@ -172,7 +172,7 @@ class EMail
$sUserName = self::$m_oConfig->Get('email_transport_smtp.username');
$sPassword = self::$m_oConfig->Get('email_transport_smtp.password');
$oTransport = Swift_SmtpTransport::newInstance($sHost, $sPort, $sEncryption);
$oTransport = new Swift_SmtpTransport($sHost, $sPort, $sEncryption);
if (strlen($sUserName) > 0)
{
$oTransport->setUsername($sUserName);
@@ -181,20 +181,20 @@ class EMail
break;
case 'Null':
$oTransport = Swift_NullTransport::newInstance();
$oTransport = new Swift_NullTransport();
break;
case 'LogFile':
$oTransport = Swift_LogFileTransport::newInstance();
$oTransport = new Swift_LogFileTransport();
$oTransport->setLogFile(APPROOT.'log/mail.log');
break;
case 'PHPMail':
default:
$oTransport = Swift_MailTransport::newInstance();
$oTransport = new Swift_SendmailTransport();
}
$oMailer = Swift_Mailer::newInstance($oTransport);
$oMailer = new Swift_Mailer($oTransport);
$aFailedRecipients = array();
$this->m_oMessage->setMaxLineLength(0);
@@ -377,7 +377,7 @@ class EMail
$this->m_aData['attachments'] = array();
}
$this->m_aData['attachments'][] = array('data' => base64_encode($data), 'filename' => $sFileName, 'mimeType' => $sMimeType);
$this->m_oMessage->attach(Swift_Attachment::newInstance($data, $sFileName, $sMimeType));
$this->m_oMessage->attach(new Swift_Attachment($data, $sFileName, $sMimeType));
}
public function SetSubject($sSubject)

7
test/phpunit.xml.dist
View File

@@ -5,6 +5,7 @@
bootstrap="unittestautoload.php"
backupGlobals="true"
colors="true"
columns="120"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
@@ -18,8 +19,10 @@
>
<php>
<ini name="display_errors" value="true"/>
<ini name="error_reporting" value="true"/>
<ini name="error_reporting" value="E_ALL"/>
<ini name="display_errors" value="On"/>
<ini name="log_errors" value="On"/>
<ini name="html_errors" value="Off"/>
</php>
<testsuites>

7
test/postbuild_integration.xml.dist
View File

@@ -17,6 +17,13 @@
verbose="true"
>
<php>
<ini name="error_reporting" value="E_ALL"/>
<ini name="display_errors" value="On"/>
<ini name="log_errors" value="On"/>
<ini name="html_errors" value="On"/>
</php>
<testsuites>
<testsuite name="PostBuildIntegration">
<directory>postbuild_integration</directory>