fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix some obvious compatibility issues with new dependencies

Browse source
This commit is contained in:
Kijin Sung 2018-10-18 14:10:02 +09:00
parent ab195fbf3b
commit ad96ae6bb6
6 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/drivers/mail/mailfunction.php
View file

@ -12,7 +12,7 @@ class MailFunction extends Base implements \Rhymix\Framework\Drivers\MailInterfa
*/ */
protected function __construct() protected function __construct()
{ {
$this->mailer = \Swift_Mailer::newInstance(\Swift_MailTransport::newInstance()); $this->mailer = new \Swift_Mailer(new \Swift_MailTransport);
} }
/** /**

4
common/framework/drivers/mail/ses.php
View file

@ -17,10 +17,10 @@ class SES extends Base implements \Rhymix\Framework\Drivers\MailInterface
*/ */
protected function __construct(array $config) protected function __construct(array $config)
{ {
$transport = \Swift_AWSTransport::newInstance($config['api_key'] ?: $config['api_user'], $config['api_secret'] ?: $config['api_pass']); $transport = new \Swift_AWSTransport($config['api_key'] ?: $config['api_user'], $config['api_secret'] ?: $config['api_pass']);
$transport->setDebug(array($this, 'debugCallback')); $transport->setDebug(array($this, 'debugCallback'));
$transport->setEndpoint('https://email.' . strtolower($config['api_type']) . '.amazonaws.com/'); $transport->setEndpoint('https://email.' . strtolower($config['api_type']) . '.amazonaws.com/');
$this->mailer = \Swift_Mailer::newInstance($transport); $this->mailer = new \Swift_Mailer($transport);
} }
/** /**

4
common/framework/drivers/mail/smtp.php
View file

@ -12,7 +12,7 @@ class SMTP extends Base implements \Rhymix\Framework\Drivers\MailInterface
*/ */
protected function __construct(array $config) protected function __construct(array $config)
{ {
$transport = \Swift_SmtpTransport::newInstance($config['smtp_host'], $config['smtp_port'], $config['smtp_security']); $transport = new \Swift_SmtpTransport($config['smtp_host'], $config['smtp_port'], $config['smtp_security']);
$transport->setUsername($config['smtp_user']); $transport->setUsername($config['smtp_user']);
$transport->setPassword($config['smtp_pass']); $transport->setPassword($config['smtp_pass']);
$local_domain = $transport->getLocalDomain(); $local_domain = $transport->getLocalDomain();
@ -20,7 +20,7 @@ class SMTP extends Base implements \Rhymix\Framework\Drivers\MailInterface
{ {
$transport->setLocalDomain($matches[1]); $transport->setLocalDomain($matches[1]);
} }
$this->mailer = \Swift_Mailer::newInstance($transport); $this->mailer = new \Swift_Mailer($transport);
} }
/** /**

1
common/framework/formatter.php
View file

@ -129,7 +129,6 @@ class Formatter
{ {
$converter = new \League\HTMLToMarkdown\HtmlConverter(); $converter = new \League\HTMLToMarkdown\HtmlConverter();
$converter->getConfig()->setOption('bold_style', '**'); $converter->getConfig()->setOption('bold_style', '**');
$converter->getConfig()->setOption('italic_style', '_');
$converter->getConfig()->setOption('strip_tags', true); $converter->getConfig()->setOption('strip_tags', true);
return trim($converter->convert($html)) . "\n"; return trim($converter->convert($html)) . "\n";
} }

2
common/framework/mail.php
View file

@ -112,7 +112,7 @@ class Mail
*/ */
public function __construct() public function __construct()
{ {
$this->message = \Swift_Message::newInstance(); $this->message = new \Swift_Message;
$this->driver = self::getDefaultDriver(); $this->driver = self::getDefaultDriver();
} }

2
vendor/jmhobbs/swiftmailer-transport-aws-ses/classes/Swift/AWSTransport.php vendored
View file

@ -102,7 +102,7 @@
* @return int * @return int
* @throws AWSConnectionError * @throws AWSConnectionError
*/ */
public function send( Swift_Mime_Message $message, &$failedRecipients = null ) { public function send( Swift_Mime_SimpleMessage $message, &$failedRecipients = null ) {
if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
{ {