Merge branch '5.x'

Author: ddrv

README.md

@@ -41,10 +41,9 @@ $transport = new Ddrv\Mailer\Transport\SendmailTransport(
 $transport = new Ddrv\Mailer\Transport\SmtpTransport(
     'smtp.fight.club',  // host (REQUIRED)
     25,                 // port (REQUIRED)
-    'joe',              // login (REQUIRED)
-    'IAmJoesLiver',     // password (REQUIRED)
+    'info',             // login (REQUIRED)
+    'super-secret',     // password (REQUIRED)
     '[email protected]',   // sender email (REQUIRED)
-    'Fight Club',       // sender name
     null,               // encryption: 'tls', 'ssl' or null
     'http://fight.club' // domain
 );
@@ -114,28 +113,27 @@ $html .= '<img src="cid:poster" alt="Poster"/><img src="cid:ticket" alt="Your ti
 $message->setHtml($html);
 
 $message->setSender('[email protected]', 'Support od Fight Club'); // The SMTP transport will set its value.
-$message->removeSender(); // If you decide to cancel. The SMTP transport will set its value.
 
-$message->addRecipient('[email protected]', 'Tyler Durden', Ddrv\Mailer\Contract\Message::RECIPIENT_TO);
-$message->addRecipient('[email protected]', 'Robert Paulson', Ddrv\Mailer\Contract\Message::RECIPIENT_CC);
-$message->addRecipient('[email protected]', 'Angel Face', Ddrv\Mailer\Contract\Message::RECIPIENT_BCC);
-$message->addRecipient('[email protected]', 'Richard Chesler', Ddrv\Mailer\Contract\Message::RECIPIENT_TO);
+$message->addRecipient('[email protected]', 'Tyler Durden', Ddrv\Mailer\Message::RECIPIENT_TO);
+$message->addRecipient('[email protected]', 'Robert Paulson', Ddrv\Mailer\Message::RECIPIENT_CC);
+$message->addRecipient('[email protected]', 'Angel Face', Ddrv\Mailer\Message::RECIPIENT_BCC);
+$message->addRecipient('[email protected]', 'Richard Chesler', Ddrv\Mailer\Message::RECIPIENT_TO);
 
 $message->getRecipientName('[email protected]'); // Returns 'Robert Paulson'.
 $message->getRecipientName('[email protected]'); // Returns null.
 
 $message->removeRecipient('[email protected]'); // If you change your mind.
 
 // You may remove recipients by type
-$message->removeRecipients(Ddrv\Mailer\Contract\Message::RECIPIENT_TO);
-$message->removeRecipients(Ddrv\Mailer\Contract\Message::RECIPIENT_CC);
-$message->removeRecipients(Ddrv\Mailer\Contract\Message::RECIPIENT_BCC);
+$message->removeRecipients(Ddrv\Mailer\Message::RECIPIENT_TO);
+$message->removeRecipients(Ddrv\Mailer\Message::RECIPIENT_CC);
+$message->removeRecipients(Ddrv\Mailer\Message::RECIPIENT_BCC);
 // Or all
 $message->removeRecipients();
 
-$message->addRecipient('[email protected]', 'Tyler Durden', Ddrv\Mailer\Contract\Message::RECIPIENT_TO);
-$message->addRecipient('[email protected]', 'Robert Paulson', Ddrv\Mailer\Contract\Message::RECIPIENT_CC);
-$message->addRecipient('[email protected]', 'Angel Face', Ddrv\Mailer\Contract\Message::RECIPIENT_BCC);
+$message->addRecipient('[email protected]', 'Tyler Durden', Ddrv\Mailer\Message::RECIPIENT_TO);
+$message->addRecipient('[email protected]', 'Robert Paulson', Ddrv\Mailer\Message::RECIPIENT_CC);
+$message->addRecipient('[email protected]', 'Angel Face', Ddrv\Mailer\Message::RECIPIENT_BCC);
 
 
 

composer.json

@@ -25,10 +25,7 @@
     "autoload": {
         "psr-4": {
             "Ddrv\\Mailer\\": "src/"
-        },
-        "files": [
-            "fn.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {

fn.php

@@ -2,36 +2,11 @@
 
 namespace Ddrv\Mailer\Contract;
 
-use Ddrv\Mailer\Exception\InvalidEmailException;
 use Serializable;
 
 interface Message extends Serializable
 {
 
-    const RECIPIENT_TO = 'to';
-    const RECIPIENT_CC = 'cc';
-    const RECIPIENT_BCC = 'bcc';
-
-    /**
-     * @param string $email Recipient email.
-     * @param string|null $name Recipient name.
-     * @param string $type Recipient type. May be 'to', 'cc' or 'bcc'. Default 'to'.
-     * @return self
-     * @throws InvalidEmailException
-     */
-    public function addRecipient($email, $name = null, $type = self::RECIPIENT_TO);
-
-    /**
-     * @param string $email Recipient email.
-     * @return string|null Recipient name or null.
-     */
-    public function getRecipientName($email);
-
-    /**
-     * @param string $type Recipient type. May be 'to', 'cc', 'bcc' or null. Default null.
-     * @return self
-     */
-    public function removeRecipients($type = null);
 
     /**
      * @param string $email Sender email.
@@ -45,11 +20,6 @@ public function setSender($email, $name = null);
      */
     public function getRecipients();
 
-    /**
-     * @return string|null Mail subject.
-     */
-    public function getSubject();
-
     /**
      * @return string Rew string as email headers
      */
@@ -59,4 +29,9 @@ public function getHeadersRaw();
      * @return string Raw string of email body
      */
     public function getBodyRaw();
+
+    /**
+     * @return Message[]
+     */
+    public function getPersonalMessages();
 }

src/Contract/Message.php

@@ -2,7 +2,6 @@
 
 namespace Ddrv\Mailer\Contract;
 
-use Ddrv\Mailer\Exception\RecipientsListEmptyException;
 use Ddrv\Mailer\Exception\TransportException;
 
 interface Transport
@@ -11,7 +10,6 @@ interface Transport
     /**
      * @param Message $message
      * @return bool
-     * @throws RecipientsListEmptyException
      * @throws TransportException
      */
     public function send(Message $message);

src/Contract/Transport.php

@@ -6,7 +6,6 @@
 use Ddrv\Mailer\Contract\Transport;
 use Ddrv\Mailer\Exception\RecipientsListEmptyException;
 use Ddrv\Mailer\Exception\TransportException;
-use Exception;
 
 final class Mailer
 {
@@ -46,6 +45,7 @@ public function __construct(Transport $transport, $senderEmail = null, $senderNa
      * @param Message $message
      * @return bool
      * @throws RecipientsListEmptyException
+     * @throws TransportException
      */
     public function send(Message $message)
     {
@@ -67,7 +67,6 @@ public function personal(Message $message)
      * @param bool $personal
      * @return int
      * @throws RecipientsListEmptyException
-     * @throws TransportException
      */
     private function sendMail(Message $message, $personal = false)
     {
@@ -77,26 +76,20 @@ private function sendMail(Message $message, $personal = false)
         if ($this->senderEmail) {
             $message->setSender($this->senderEmail, $this->senderName);
         }
-        $messages = array();
         if ($personal) {
-            $recipients = $message->getRecipients();
-            foreach ($recipients as $recipient) {
-                $name = $message->getRecipientName($recipient);
-                $new = clone $message;
-                $messages[] = $new->removeRecipients()->addRecipient($recipient, $name);
-            }
+            $messages = $message->getPersonalMessages();
         } else {
-            $messages[] = $message;
+            $messages = array($message);
         }
         $result = 0;
         foreach ($messages as $msg) {
             try {
-                $ok = $this->transport->send($msg);
-            } catch (RecipientsListEmptyException $e) {
-                $ok = false;
-            }
-            if ($ok) {
+                $this->transport->send($msg);
                 $result++;
+            } catch (TransportException $exception) {
+                if (!$personal) {
+                    throw $exception;
+                }
             }
         }
         return $result;