Merge branch 'master' of https://github.com/dacastro4/laravel-gmail

� Conflicts:
�	composer.json

Author: dacastro4

composer.json

@@ -23,7 +23,7 @@
     "illuminate/routing": "~5.8|^6.0|^7.0|^8.0|^9.0",
     "illuminate/session": "~5.8|^6.0|^7.0|^8.0|^9.0",
     "illuminate/support": "~5.8|^6.0|^7.0|^8.0|^9.0",
-    "swiftmailer/swiftmailer": "~5.8|^6.0",
+    "symfony/mime": "^5.4|^6.0",
     "ext-json": "*"
   },
   "require-dev": {

src/Traits/Replyable.php

@@ -5,10 +5,9 @@
 use Dacastro4\LaravelGmail\Services\Message\Mail;
 use Google_Service_Gmail;
 use Google_Service_Gmail_Message;
+use Symfony\Component\Mime\Email;
 use Illuminate\Container\Container;
 use Illuminate\Mail\Markdown;
-use Swift_Attachment;
-use Swift_Message;
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 
 /**
@@ -18,7 +17,7 @@ trait Replyable
 {
 	use HasHeaders;
 
-	private $swiftMessage;
+	private $symfonyEmail;
 
 	/**
 	 * Gmail optional parameters
@@ -108,7 +107,7 @@ trait Replyable
 
 	public function __construct()
 	{
-		$this->swiftMessage = new Swift_Message();
+		$this->symfonyEmail = new Email();
 	}
 
 	/**
@@ -356,7 +355,7 @@ public abstract function getThreadId();
 	 */
 	public function setHeader($header, $value)
 	{
-		$headers = $this->swiftMessage->getHeaders();
+		$headers = $this->symfonyEmail->getHeaders();
 
 		$headers->addTextHeader($header, $value);
 
@@ -402,21 +401,45 @@ private function getMessageBody()
 	{
 		$body = new Google_Service_Gmail_Message();
 
-		$this->swiftMessage
-			->setSubject($this->subject)
-			->setFrom($this->from, $this->nameFrom)
-			->setTo($this->to, $this->nameTo)
-			->setCc($this->cc, $this->nameCc)
-			->setBcc($this->bcc, $this->nameBcc)
-			->setBody($this->message, 'text/html')
-			->setPriority($this->priority);
-
-		foreach ($this->attachments as $file) {
-			$this->swiftMessage
-				->attach(Swift_Attachment::fromPath($file));
-		}
-
-		$body->setRaw($this->base64_encode($this->swiftMessage->toString()));
+        if ($this->from) {
+            $this->symfonyEmail->from($this->from, ($this->nameFrom ? $this->nameFrom : ''));
+        }
+
+        if ($this->to) {
+            $this->symfonyEmail->to($this->to, ($this->nameTo ? $this->nameTo : ''));
+        }
+
+        if ($this->cc) {
+            if (is_array($this->cc)) {
+                foreach ($this->cc as $emailCc => $nameCc) {
+                    $this->symfonyEmail->addCc($emailCc, $nameCc);
+                }
+            } else {
+                $this->symfonyEmail->cc($this->cc, ($this->nameCc ? $this->nameCc : ''));
+            }
+        }
+
+        $bccString = "";
+        if ($this->bcc) {
+            if (is_array($this->bcc)) {
+                foreach ($this->bcc as $emailBcc => $nameBcc) {
+                    $bccString .= "Bcc: " . $nameBcc . " <" . $emailBcc . ">\r\n";
+                }
+            } else {
+                $bccString .= "Bcc: " . ($this->nameBcc ? $this->nameBcc . " " : "") . "<" . $this->bcc . ">\r\n";
+            }
+        }
+
+        $this->symfonyEmail->subject($this->subject)
+            ->html($this->message)
+            ->priority($this->priority)
+        ;
+
+        foreach ($this->attachments as $file) {
+            $this->symfonyEmail->attachFromPath($file);
+        }
+
+        $body->setRaw($this->base64_encode($bccString . $this->symfonyEmail->toString()));
 
 		return $body;
 	}