Composer update
* updated Laravel to v5.6.38 * Added laravel tinker in dev dependencies
This commit is contained in:
committed by
Manish Verma
parent
be4b1231b6
commit
6742e13d81
11
vendor/swiftmailer/swiftmailer/CHANGES
vendored
11
vendor/swiftmailer/swiftmailer/CHANGES
vendored
@@ -1,6 +1,17 @@
|
||||
Changelog
|
||||
=========
|
||||
|
||||
6.1.3 (2018-XX-XX)
|
||||
------------------
|
||||
|
||||
* added auto-start to the SMTP transport when sending a message
|
||||
* tweaked error message when the response from an SMTP server is empty
|
||||
* fixed missing property in Swift_Mime_IdGenerator
|
||||
* exposed original body content type with Swift_Mime_SimpleMimeEntity::getBodyContentType()
|
||||
* fixed typo in variable name in Swift_AddressEncoder_IdnAddressEncoder
|
||||
* fixed return type in MessageLogger
|
||||
* fixed missing property addressEncoder in SimpleHeaderFactory class
|
||||
|
||||
6.1.2 (2018-07-13)
|
||||
------------------
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
abstract class Swift
|
||||
{
|
||||
const VERSION = '6.1.2';
|
||||
const VERSION = '6.1.3';
|
||||
|
||||
public static $initialized = false;
|
||||
public static $inits = [];
|
||||
|
||||
@@ -64,6 +64,6 @@ class Swift_AddressEncoder_IdnAddressEncoder implements Swift_AddressEncoder
|
||||
return $punycode->encode($string);
|
||||
}
|
||||
|
||||
throw new Swift_AddressEncoderException('Non-ASCII characters in address, but no IDN encoder found (install the intl extension or the true/punycode package)', $address);
|
||||
throw new Swift_AddressEncoderException('Non-ASCII characters in address, but no IDN encoder found (install the intl extension or the true/punycode package)', $string);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,11 +32,8 @@ class Swift_Attachment extends Swift_Mime_Attachment
|
||||
->createDependenciesFor('mime.attachment')
|
||||
);
|
||||
|
||||
$this->setBody($data);
|
||||
$this->setBody($data, $contentType);
|
||||
$this->setFilename($filename);
|
||||
if ($contentType) {
|
||||
$this->setContentType($contentType);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -60,6 +60,7 @@ class Swift_Mailer
|
||||
{
|
||||
$failedRecipients = (array) $failedRecipients;
|
||||
|
||||
// FIXME: to be removed in 7.0 (as transport must now start itself on send)
|
||||
if (!$this->transport->isStarted()) {
|
||||
$this->transport->start();
|
||||
}
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
*/
|
||||
class Swift_Mime_IdGenerator implements Swift_IdGenerator
|
||||
{
|
||||
private $idRight;
|
||||
|
||||
/**
|
||||
* @param string $idRight
|
||||
*/
|
||||
@@ -46,8 +48,7 @@ class Swift_Mime_IdGenerator implements Swift_IdGenerator
|
||||
*/
|
||||
public function generateId()
|
||||
{
|
||||
$idLeft = bin2hex(random_bytes(16)); // set 32 hex values
|
||||
|
||||
return $idLeft.'@'.$this->idRight;
|
||||
// 32 hex values for the left part
|
||||
return bin2hex(random_bytes(16)).'@'.$this->idRight;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,9 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
|
||||
/** The charset of created Headers */
|
||||
private $charset;
|
||||
|
||||
/** Swift_AddressEncoder */
|
||||
private $addressEncoder;
|
||||
|
||||
/**
|
||||
* Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
|
||||
*
|
||||
|
||||
@@ -359,9 +359,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
|
||||
return $a > $b ? -1 : 1;
|
||||
}
|
||||
|
||||
if ($aPos == -1) {
|
||||
if (-1 == $aPos) {
|
||||
return 1;
|
||||
} elseif ($bPos == -1) {
|
||||
} elseif (-1 == $bPos) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -163,6 +163,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
|
||||
return $this->getHeaderFieldModel('Content-Type');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the Body Content-type of this entity.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getBodyContentType()
|
||||
{
|
||||
return $this->userContentType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the Content-type of this entity.
|
||||
*
|
||||
@@ -370,7 +380,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
|
||||
}
|
||||
|
||||
$this->body = $body;
|
||||
if (isset($contentType)) {
|
||||
if (null !== $contentType) {
|
||||
$this->setContentType($contentType);
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
|
||||
{
|
||||
/**
|
||||
* @var Swift_Mime_Message[]
|
||||
* @var Swift_Mime_SimpleMessage[]
|
||||
*/
|
||||
private $messages;
|
||||
|
||||
@@ -28,7 +28,7 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
|
||||
/**
|
||||
* Get the message list.
|
||||
*
|
||||
* @return Swift_Mime_Message[]
|
||||
* @return Swift_Mime_SimpleMessage[]
|
||||
*/
|
||||
public function getMessages()
|
||||
{
|
||||
|
||||
@@ -23,13 +23,11 @@
|
||||
class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
|
||||
{
|
||||
/**
|
||||
* Create a new SmtpTransport, optionally with $host, $port and $security.
|
||||
*
|
||||
* @param string $host
|
||||
* @param int $port
|
||||
* @param string $security
|
||||
* @param string $encryption
|
||||
*/
|
||||
public function __construct($host = 'localhost', $port = 25, $security = null)
|
||||
public function __construct($host = 'localhost', $port = 25, $encryption = null)
|
||||
{
|
||||
call_user_func_array(
|
||||
[$this, 'Swift_Transport_EsmtpTransport::__construct'],
|
||||
@@ -39,6 +37,6 @@ class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
|
||||
|
||||
$this->setHost($host);
|
||||
$this->setPort($port);
|
||||
$this->setEncryption($security);
|
||||
$this->setEncryption($encryption);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,6 +61,8 @@ interface Swift_Transport
|
||||
* Recipient/sender data will be retrieved from the Message API.
|
||||
* The return value is the number of recipients who were accepted for delivery.
|
||||
*
|
||||
* This is the responsibility of the send method to start the transport if needed.
|
||||
*
|
||||
* @param Swift_Mime_SimpleMessage $message
|
||||
* @param string[] $failedRecipients An array of failures by-reference
|
||||
*
|
||||
|
||||
@@ -177,6 +177,10 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
|
||||
*/
|
||||
public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
|
||||
{
|
||||
if (!$this->isStarted()) {
|
||||
$this->start();
|
||||
}
|
||||
|
||||
$sent = 0;
|
||||
$failedRecipients = (array) $failedRecipients;
|
||||
|
||||
@@ -188,10 +192,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
|
||||
}
|
||||
|
||||
if (!$reversePath = $this->getReversePath($message)) {
|
||||
$this->throwException(new Swift_TransportException(
|
||||
'Cannot send message without a sender address'
|
||||
)
|
||||
);
|
||||
$this->throwException(new Swift_TransportException('Cannot send message without a sender address'));
|
||||
}
|
||||
|
||||
$to = (array) $message->getTo();
|
||||
@@ -204,13 +205,10 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
|
||||
try {
|
||||
$sent += $this->sendTo($message, $reversePath, $tos, $failedRecipients);
|
||||
$sent += $this->sendBcc($message, $reversePath, $bcc, $failedRecipients);
|
||||
} catch (Exception $e) {
|
||||
} finally {
|
||||
$message->setBcc($bcc);
|
||||
throw $e;
|
||||
}
|
||||
|
||||
$message->setBcc($bcc);
|
||||
|
||||
if ($evt) {
|
||||
if ($sent == count($to) + count($cc) + count($bcc)) {
|
||||
$evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
|
||||
@@ -443,6 +441,10 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
|
||||
/** Throws an Exception if a response code is incorrect */
|
||||
protected function assertResponseCode($response, $wanted)
|
||||
{
|
||||
if (!$response) {
|
||||
$this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got an empty response'));
|
||||
}
|
||||
|
||||
list($code) = sscanf($response, '%3d');
|
||||
$valid = (empty($wanted) || in_array($code, $wanted));
|
||||
|
||||
@@ -452,12 +454,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
|
||||
}
|
||||
|
||||
if (!$valid) {
|
||||
$this->throwException(
|
||||
new Swift_TransportException(
|
||||
'Expected response code '.implode('/', $wanted).' but got code '.
|
||||
'"'.$code.'", with message "'.$response.'"',
|
||||
$code)
|
||||
);
|
||||
$this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got code "'.$code.'", with message "'.$response.'"', $code));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -473,10 +470,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
|
||||
} catch (Swift_TransportException $e) {
|
||||
$this->throwException($e);
|
||||
} catch (Swift_IoException $e) {
|
||||
$this->throwException(
|
||||
new Swift_TransportException(
|
||||
$e->getMessage())
|
||||
);
|
||||
$this->throwException(new Swift_TransportException($e->getMessage(), 0, $e));
|
||||
}
|
||||
|
||||
return $response;
|
||||
|
||||
0
vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
vendored
Normal file → Executable file
0
vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
vendored
Normal file → Executable file
@@ -37,7 +37,7 @@ class Swift_Transport_Esmtp_Auth_CramMd5AuthenticatorTest extends \SwiftMailerTe
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException Swift_TransportException
|
||||
* @expectedException \Swift_TransportException
|
||||
*/
|
||||
public function testAuthenticationFailureSendRset()
|
||||
{
|
||||
|
||||
@@ -35,7 +35,7 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticatorTest extends \SwiftMailerTest
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException Swift_TransportException
|
||||
* @expectedException \Swift_TransportException
|
||||
*/
|
||||
public function testAuthenticationFailureSendRset()
|
||||
{
|
||||
|
||||
@@ -161,7 +161,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException Swift_TransportException
|
||||
* @expectedException \Swift_TransportException
|
||||
*/
|
||||
public function testAuthenticationFailureSendRset()
|
||||
{
|
||||
|
||||
@@ -42,7 +42,7 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticatorTest extends \SwiftMailerTest
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException Swift_TransportException
|
||||
* @expectedException \Swift_TransportException
|
||||
*/
|
||||
public function testAuthenticationFailureSendRset()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user