Resolve git conflict

Author: ddrv

.gitignore

@@ -1,4 +1,4 @@
 vendor/
 phpcs.xml
 phpunit.xml
-composer.lock
+composer.lock

README.md

@@ -1,6 +1,6 @@
 [![Latest Stable Version](https://img.shields.io/packagist/v/ddrv/mailer.svg?style=flat-square)](https://packagist.org/packages/ddrv/mailer)
 [![Total Downloads](https://img.shields.io/packagist/dt/ddrv/mailer.svg?style=flat-square)](https://packagist.org/packages/ddrv/mailer/stats)
-[![License](https://img.shields.io/packagist/l/ddrv/mailer.svg?style=flat-square)](https://github.com/ddrv/mailer/blob/master/LICENSE)
+[![License](https://img.shields.io/packagist/l/ddrv/mailer.svg?style=flat-square)](https://github.com/ddrv/php-mailer/blob/master/LICENSE)
 [![PHP](https://img.shields.io/packagist/php-v/ddrv/mailer.svg?style=flat-square)](https://php.net)
 
 
@@ -223,4 +223,4 @@ $transport = TransportFactory::make('file:////path/to/mail/files');
 // fake
 $transport = TransportFactory::make('fake://localhost');
 
-```
+```

src/Exception/RecipientsListEmptyException.php

@@ -3,13 +3,12 @@
 namespace Ddrv\Mailer\Exception;
 
 use Exception;
-use Throwable;
 
 final class RecipientsListEmptyException extends Exception
 {
 
-    public function __construct(Throwable $previous = null)
+    public function __construct()
     {
-        parent::__construct("recipients list is empty", 1, $previous);
+        parent::__construct("recipients list is empty", 1);
     }
 }

src/Mailer.php

@@ -2,12 +2,12 @@
 
 namespace Ddrv\Mailer;
 
-use Throwable;
+use Exception;
 
 final class Mailer
 {
 
-    const MAILER_VERSION = "4.1.0";
+    const MAILER_VERSION = "4.1.4";
 
     /**
      * @var SpoolInterface
@@ -83,7 +83,7 @@ private function sendMail(Message $message, $personal = false, $priority = 1)
             ksort($params);
             try {
                 call_user_func_array($fn, $params);
-            } catch (Throwable $e) {
+            } catch (Exception $e) {
             }
         }
         return $this;

src/Transport/FakeTransport.php

@@ -10,7 +10,7 @@
 final class FakeTransport implements TransportInterface
 {
     /**
-     * @var callable
+     * @var Closure
      */
     private $logger;
 

src/Transport/FileTransport.php

@@ -10,7 +10,7 @@
 final class FileTransport implements TransportInterface
 {
     /**
-     * @var callable
+     * @var Closure
      */
     private $logger;
 

src/Transport/SendmailTransport.php

@@ -16,7 +16,7 @@ final class SendmailTransport implements TransportInterface
     private $options;
 
     /**
-     * @var callable
+     * @var Closure
      */
     private $logger;
 

src/Transport/SmtpTransport.php

@@ -25,7 +25,7 @@ final class SmtpTransport implements TransportInterface
     private $email;
 
     /**
-     * @var callable
+     * @var Closure
      */
     private $logger;
 
@@ -152,7 +152,9 @@ private function smtpCommand($command)
 
     public function __destruct()
     {
-        $this->smtpCommand("QUIT");
-        fclose($this->socket);
+        if (is_resource($this->socket)) {
+            $this->smtpCommand("QUIT");
+            fclose($this->socket);
+        }
     }
 }

tests/Support/Factory/MessageFactory.php

@@ -25,29 +25,41 @@ public function __construct()
     public function generateMessage($toQuantity, $ccQuantity = 0, $bccQuantity = 0)
     {
         $toQuantity = (int)$toQuantity;
-        if ($toQuantity < 1) $toQuantity = 1;
-        if ($toQuantity > 20) $toQuantity = 20;
+        if ($toQuantity < 1) {
+            $toQuantity = 1;
+        }
+        if ($toQuantity > 20) {
+            $toQuantity = 20;
+        }
         $ccQuantity = (int)$ccQuantity;
-        if ($ccQuantity < 0) $ccQuantity = 0;
-        if ($ccQuantity > 20) $ccQuantity = 20;
+        if ($ccQuantity < 0) {
+            $ccQuantity = 0;
+        }
+        if ($ccQuantity > 20) {
+            $ccQuantity = 20;
+        }
         $bccQuantity = (int)$bccQuantity;
-        if ($bccQuantity < 0) $bccQuantity = 0;
-        if ($bccQuantity > 20) $bccQuantity = 20;
+        if ($bccQuantity < 0) {
+            $bccQuantity = 0;
+        }
+        if ($bccQuantity > 20) {
+            $bccQuantity = 20;
+        }
         $all = $toQuantity + $ccQuantity + $bccQuantity;
         $recipients = $this->generateRecipients($all);
 
         $subject = $this->faker->text(50);
         $text = $this->faker->randomHtml();
         $message = new Message($subject, $text, true);
-        for ($n=1; $n<=$toQuantity; $n++) {
+        for ($n = 1; $n <= $toQuantity; $n++) {
             $recipient = array_shift($recipients);
             $message->addTo($recipient["email"], $recipient["name"]);
         }
-        for ($n=1; $n<=$ccQuantity; $n++) {
+        for ($n = 1; $n <= $ccQuantity; $n++) {
             $recipient = array_shift($recipients);
             $message->addCc($recipient["email"], $recipient["name"]);
         }
-        for ($n=1; $n<=$bccQuantity; $n++) {
+        for ($n = 1; $n <= $bccQuantity; $n++) {
             $recipient = array_shift($recipients);
             $message->addBcc($recipient["email"], $recipient["name"]);
         }
@@ -58,8 +70,12 @@ public function generateMessage($toQuantity, $ccQuantity = 0, $bccQuantity = 0)
     public function generateRecipients($quantity)
     {
         $quantity = (int)$quantity;
-        if ($quantity < 1) $quantity = 1;
-        if ($quantity > 100) $quantity = 100;
+        if ($quantity < 1) {
+            $quantity = 1;
+        }
+        if ($quantity > 100) {
+            $quantity = 100;
+        }
         $recipients = array();
         do {
             $email = $this->faker->email;
@@ -72,4 +88,4 @@ public function generateRecipients($quantity)
         } while (count($recipients) < $quantity);
         return $recipients;
     }
-}
+}

tests/Support/Mock/Transport/MockTransport.php

@@ -10,7 +10,7 @@
 final class MockTransport implements TransportInterface
 {
     /**
-     * @var callable
+     * @var Closure
      */
     private $logger;
 
@@ -47,4 +47,4 @@ public function count()
     {
         return count($this->messages);
     }
-}
+}

tests/Unit/MailerTest.php

@@ -32,9 +32,6 @@ public function setUp()
         parent::setUp();
         $this->factory = new MessageFactory();
         $this->transport = new MockTransport();
-        $this->transport->setLogger(function($log) {
-            echo $log.PHP_EOL.PHP_EOL.PHP_EOL.PHP_EOL;
-        });
         $this->mailer = new Mailer(new MemorySpool($this->transport));
     }
 
@@ -92,17 +89,17 @@ public function testSpoolPersonalSend()
     private function generateMessages($quantity)
     {
         $messages = array();
-        for ($i=1; $i<=$quantity; $i++) {
-            $messages[] = $this->factory->generateMessage(rand(1,20), rand(1,20), rand(1,20));
+        for ($i = 1; $i <= $quantity; $i++) {
+            $messages[] = $this->factory->generateMessage(rand(1, 20), rand(1, 20), rand(1, 20));
         }
         return $messages;
     }
 
     public static function assertMessage(Message $expected, Message $actual)
     {
-        self::assertSame($expected->getSubject(),    $actual->getSubject());
-        self::assertSame($expected->getBody(),       $actual->getBody());
-        self::assertSame($expected->getHeaders(),    $actual->getHeaders());
+        self::assertSame($expected->getSubject(), $actual->getSubject());
+        self::assertSame($expected->getBody(), $actual->getBody());
+        self::assertSame($expected->getHeaders(), $actual->getHeaders());
         self::assertSame($expected->getRecipients(), $actual->getRecipients());
     }
-}
+}