Bump swiftmailer/swiftmailer from 6.2.5 to 6.2.7

Bumps [swiftmailer/swiftmailer](https://github.com/swiftmailer/swiftmailer) from 6.2.5 to 6.2.7. - [Release notes](https://github.com/swiftmailer/swiftmailer/releases) - [Changelog](https://github.com/swiftmailer/swiftmailer/blob/master/CHANGES) - [Commits](swiftmailer/swiftmailer@v6.2.5...v6.2.7) --- updated-dependencies: - dependency-name: swiftmailer/swiftmailer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Jun 21, 2021 · f73d84e · f73d84e
1 parent d984340
commit f73d84e
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 44 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
@@ -120,6 +120,6 @@
     '8a9dc1de0ca7e01f3e08231539562f61' => $vendorDir . '/aws/aws-sdk-php/src/functions.php',
     '538ca81a9a966a6716601ecf48f4eaef' => $vendorDir . '/opis/closure/functions.php',
     'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
-    '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
     '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
+    '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
 );
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
@@ -121,8 +121,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         '8a9dc1de0ca7e01f3e08231539562f61' => __DIR__ . '/..' . '/aws/aws-sdk-php/src/functions.php',
         '538ca81a9a966a6716601ecf48f4eaef' => __DIR__ . '/..' . '/opis/closure/functions.php',
         'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
-        '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
         '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
+        '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
     );
 
     public static $prefixLengthsPsr4 = array (

diff --git a/composer/installed.json b/composer/installed.json
@@ -4433,21 +4433,21 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v6.2.5",
-            "version_normalized": "6.2.5.0",
+            "version": "v6.2.7",
+            "version_normalized": "6.2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7"
+                "reference": "15f7faf8508e04471f666633addacf54c0ab5933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/698a6a9f54d7eb321274de3ad19863802c879fb7",
-                "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933",
+                "reference": "15f7faf8508e04471f666633addacf54c0ab5933",
                 "shasum": ""
             },
             "require": {
-                "egulias/email-validator": "^2.0",
+                "egulias/email-validator": "^2.0|^3.1",
                 "php": ">=7.0.0",
                 "symfony/polyfill-iconv": "^1.0",
                 "symfony/polyfill-intl-idn": "^1.10",
@@ -4460,7 +4460,7 @@
             "suggest": {
                 "ext-intl": "Needed to support internationalized email addresses"
             },
-            "time": "2021-01-12T09:35:59+00:00",
+            "time": "2021-03-09T12:30:35+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -4495,7 +4495,7 @@
             ],
             "support": {
                 "issues": "https://github.com/swiftmailer/swiftmailer/issues",
-                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.5"
+                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7"
             },
             "funding": [
                 {

diff --git a/composer/installed.php b/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
-        'reference' => 'fdd5a6a23827e127577a93914eaf6282839201c2',
+        'reference' => 'c43adc622e03fe222662397916edb210f5ad18d3',
         'name' => 'nextcloud/3rdparty',
         'dev' => true,
     ),
@@ -286,7 +286,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
-            'reference' => 'fdd5a6a23827e127577a93914eaf6282839201c2',
+            'reference' => 'c43adc622e03fe222662397916edb210f5ad18d3',
             'dev_requirement' => false,
         ),
         'nextcloud/lognormalizer' => array(
@@ -671,12 +671,12 @@
             'dev_requirement' => false,
         ),
         'swiftmailer/swiftmailer' => array(
-            'pretty_version' => 'v6.2.5',
-            'version' => '6.2.5.0',
+            'pretty_version' => 'v6.2.7',
+            'version' => '6.2.7.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../swiftmailer/swiftmailer',
             'aliases' => array(),
-            'reference' => '698a6a9f54d7eb321274de3ad19863802c879fb7',
+            'reference' => '15f7faf8508e04471f666633addacf54c0ab5933',
             'dev_requirement' => false,
         ),
         'symfony/console' => array(

diff --git a/composer/package-versions-deprecated/src/PackageVersions/Versions.php b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
@@ -98,7 +98,7 @@ final class Versions
   'spomky-labs/base64url' => 'v2.0.4@7752ce931ec285da4ed1f4c5aa27e45e097be61d',
   'spomky-labs/cbor-php' => 'v2.0.1@9776578000be884cd7864eeb7c37a4ac92d8c995',
   'stecman/symfony-console-completion' => '0.11.0@a9502dab59405e275a9f264536c4e1cb61fc3518',
-  'swiftmailer/swiftmailer' => 'v6.2.5@698a6a9f54d7eb321274de3ad19863802c879fb7',
+  'swiftmailer/swiftmailer' => 'v6.2.7@15f7faf8508e04471f666633addacf54c0ab5933',
   'symfony/console' => 'v4.4.25@a62acecdf5b50e314a4f305cd01b5282126f3095',
   'symfony/event-dispatcher' => 'v4.4.25@047773e7016e4fd45102cedf4bd2558ae0d0c32f',
   'symfony/event-dispatcher-contracts' => 'v1.1.9@84e23fdcd2517bf37aecbd16967e83f0caee25a7',
@@ -120,7 +120,7 @@ final class Versions
   'web-auth/cose-lib' => 'v3.3.1@eea6fae63ff5c81bf98c115b1be5f38a69682c16',
   'web-auth/metadata-service' => 'v3.3.1@8488d3a832a38cc81c670fce05de1e515c6e64b1',
   'web-auth/webauthn-lib' => 'v3.3.1@e411527a41c1013512fccdfce61681eb36484c77',
-  'nextcloud/3rdparty' => 'dev-master@fdd5a6a23827e127577a93914eaf6282839201c2',
+  'nextcloud/3rdparty' => 'dev-master@c43adc622e03fe222662397916edb210f5ad18d3',
 );
 
     private function __construct()

diff --git a/swiftmailer/swiftmailer/lib/classes/Swift.php b/swiftmailer/swiftmailer/lib/classes/Swift.php
@@ -15,7 +15,7 @@
  */
 abstract class Swift
 {
-    const VERSION = '6.2.5-DEV';
+    const VERSION = '6.2.7';
 
     public static $initialized = false;
     public static $inits = [];

diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -9,6 +9,7 @@
  */
 
 use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\MessageIDValidation;
 use Egulias\EmailValidator\Validation\RFCValidation;
 
 /**
@@ -179,7 +180,9 @@ public function getFieldBody()
      */
     private function assertValidId($id)
     {
-        if (!$this->emailValidator->isValid($id, new RFCValidation())) {
+        $emailValidation = class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation();
+
+        if (!$this->emailValidator->isValid($id, $emailValidation)) {
             throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
         }
     }

diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -177,7 +177,7 @@ public function set(Swift_Mime_Header $header, $index = 0)
      * @param string $name
      * @param int    $index
      *
-     * @return Swift_Mime_Header
+     * @return Swift_Mime_Header|null
      */
     public function get($name, $index = 0)
     {

diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php b/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -25,7 +25,10 @@ class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
     /**
      * @param string $host
      * @param int    $port
-     * @param string $encryption
+     * @param string|null $encryption SMTP encryption mode:
+     *        - null for plain SMTP (no encryption),
+     *        - 'tls' for SMTP with STARTTLS (best effort encryption),
+     *        - 'ssl' for SMTPS = SMTP over TLS (always encrypted).
      */
     public function __construct($host = 'localhost', $port = 25, $encryption = null)
     {

diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -197,14 +197,13 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
 
         $to = (array) $message->getTo();
         $cc = (array) $message->getCc();
-        $tos = array_merge($to, $cc);
         $bcc = (array) $message->getBcc();
+        $tos = array_merge($to, $cc, $bcc);
 
         $message->setBcc([]);
 
         try {
             $sent += $this->sendTo($message, $reversePath, $tos, $failedRecipients);
-            $sent += $this->sendBcc($message, $reversePath, $bcc, $failedRecipients);
         } finally {
             $message->setBcc($bcc);
         }
@@ -519,20 +518,6 @@ private function sendTo(Swift_Mime_SimpleMessage $message, $reversePath, array $
             $failedRecipients);
     }
 
-    /** Send a message to all Bcc: recipients */
-    private function sendBcc(Swift_Mime_SimpleMessage $message, $reversePath, array $bcc, array &$failedRecipients)
-    {
-        $sent = 0;
-        foreach ($bcc as $forwardPath => $name) {
-            $message->setBcc([$forwardPath => $name]);
-            $sent += $this->doMailTransaction(
-                $message, $reversePath, [$forwardPath], $failedRecipients
-                );
-        }
-
-        return $sent;
-    }
-
     /**
      * Destructor.
      */