Skip to content

Commit

Permalink
Merge pull request #23 from wangyan/hotfix/iss22
Browse files Browse the repository at this point in the history
Add support for Laravel 5.5. close #22
  • Loading branch information
nauxliu authored Oct 8, 2017
2 parents f607e81 + 2c95d8d commit 9981bdc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
],
"require": {
"php": ">=5.6",
"illuminate/support": "^5.1",
"guzzlehttp/guzzle": "^6.1"
"illuminate/support": "^5.5",
"guzzlehttp/guzzle": "^6.2"
},
"autoload": {
"psr-4": {
Expand Down
18 changes: 9 additions & 9 deletions src/SendCloudTransport.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use GuzzleHttp\Client;
use Illuminate\Mail\Transport\Transport;
use Psr\Http\Message\ResponseInterface;
use Swift_Mime_Message;
use Swift_Mime_SimpleMessage;

/**
* Created by PhpStorm.
Expand Down Expand Up @@ -41,12 +41,12 @@ public function __construct($api_user, $api_key)
* Recipient/sender data will be retrieved from the Message API.
* The return value is the number of recipients who were accepted for delivery.
*
* @param Swift_Mime_Message $message
* @param Swift_Mime_SimpleMessage $message
* @param string[] $failedRecipients An array of failures by-reference
*
* @return int
*/
public function send(Swift_Mime_Message $message, &$failedRecipients = null)
public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
{
$this->addQuery('api_user', $this->api_user);
$this->addQuery('api_key', $this->api_key);
Expand Down Expand Up @@ -101,11 +101,11 @@ protected function getAddress($data)
/**
* 获取发件人名.
*
* @param Swift_Mime_Message $message
* @param Swift_Mime_SimpleMessage $message
*
* @return mixed
*/
protected function getFromName(Swift_Mime_Message $message)
protected function getFromName(Swift_Mime_SimpleMessage $message)
{
return array_get(array_values($message->getFrom()), 0);
}
Expand Down Expand Up @@ -134,13 +134,13 @@ protected function getAddresses($data)
/**
* 发送普通邮件.
*
* @param Swift_Mime_Message $message
* @param Swift_Mime_SimpleMessage $message
*
* @return bool
*
* @throws SendCloudException
*/
protected function sendRawMessage(Swift_Mime_Message $message)
protected function sendRawMessage(Swift_Mime_SimpleMessage $message)
{
$http = new Client();

Expand All @@ -157,15 +157,15 @@ protected function sendRawMessage(Swift_Mime_Message $message)
/**
* 发送模板邮件.
*
* @param Swift_Mime_Message $message
* @param Swift_Mime_SimpleMessage $message
*
* @return bool
*
* @throws SendCloudException
*
* @internal param SendCloudTemplate $template
*/
protected function sendTemplate(Swift_Mime_Message $message)
protected function sendTemplate(Swift_Mime_SimpleMessage $message)
{
$http = new Client();

Expand Down

0 comments on commit 9981bdc

Please sign in to comment.