Fix add address by type with new array key and array recipients

weprovide · Aug 31, 2020 · 4adfa3c · 4adfa3c
1 parent 13887fb
commit 4adfa3c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Mail/Template/TransportBuilder.php b/Mail/Template/TransportBuilder.php
@@ -358,15 +358,14 @@ private function addAddressByType(string $addressType, $email, ?string $name = n
     {
         if (is_string($email)) {
             $this->messageData[$addressType][] = $this->addressConverter->convert($email, $name);
+
             return;
         }
+
         $convertedAddressArray = $this->addressConverter->convertMany($email);
-        if (isset($this->messageData[$addressType])) {
-            $this->messageData[$addressType] = array_merge(
-                $this->messageData[$addressType],
-                $convertedAddressArray
-            );
-        }
+        $this->messageData[$addressType] = array_merge($this->messageData[$addressType] ?? [], $convertedAddressArray);
+
+        return $this;
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -2,10 +2,15 @@
     "name": "weprovide/magento2-module-mailattachment",
     "description": "Extends TransportBuilder with attachment functionality",
     "type": "magento2-module",
+    "version": "2.1.2",
     "authors": [
         {
             "email": "[email protected]",
             "name": "Sander Hartman"
+        },
+        {
+            "email": "[email protected]",
+            "name": "Mischa Braam"
         }
     ],
     "license": "MIT",