Merge pull request #6 from byjg/2.0.1

Fix PHPUnit
byjg · Nov 29, 2017 · f7c21b2 · f7c21b2
2 parents 7ea1059 + b90026e
commit f7c21b2
Show file tree

Hide file tree

Showing 18 changed files with 132 additions and 11 deletions.
diff --git a/src/Exception/InvalidMailHandlerException.php b/src/Exception/InvalidMailHandlerException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ByJG\Mail\Exception;
+
+class InvalidMailHandlerException extends \Exception
+{
+
+}
diff --git a/src/Exception/InvalidMessageFormatException.php b/src/Exception/InvalidMessageFormatException.php
@@ -2,7 +2,6 @@
 
 namespace ByJG\Mail\Exception;
 
-
 class InvalidMessageFormatException extends \Exception
 {
 

diff --git a/src/Exception/MailApiException.php b/src/Exception/MailApiException.php
@@ -2,7 +2,6 @@
 
 namespace ByJG\Mail\Exception;
 
-
 class MailApiException extends \Exception
 {
 

diff --git a/src/Exception/ProtocolNotRegisteredException.php b/src/Exception/ProtocolNotRegisteredException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ByJG\Mail\Exception;
+
+class ProtocolNotRegisteredException extends \Exception
+{
+
+}
diff --git a/src/MailerFactory.php b/src/MailerFactory.php
@@ -7,26 +7,38 @@
 
 namespace ByJG\Mail;
 
+use ByJG\Mail\Exception\InvalidMailHandlerException;
+use ByJG\Mail\Exception\ProtocolNotRegisteredException;
 use ByJG\Util\Uri;
 
 class MailerFactory
 {
     private static $config = [];
 
+    /**
+     * @param string $protocol
+     * @param string $class
+     * @throws \ByJG\Mail\Exception\InvalidMailHandlerException
+     */
     public static function registerMailer($protocol, $class)
     {
         if (!class_exists($class, true)) {
-            throw new \Exception('Class not found!');
+            throw new InvalidMailHandlerException('Class not found!');
         }
         self::$config[$protocol] = $class;
     }
 
+    /**
+     * @param $connection
+     * @return mixed
+     * @throws \ByJG\Mail\Exception\ProtocolNotRegisteredException
+     */
     public static function create($connection)
     {
         $uri = new Uri($connection);
 
         if (!isset(self::$config[$uri->getScheme()])) {
-            throw new \Exception('Protocol not found/registered!');
+            throw new ProtocolNotRegisteredException('Protocol not found/registered!');
         }
 
         $class = self::$config[$uri->getScheme()];

diff --git a/src/Override/PHPMailerOverride.php b/src/Override/PHPMailerOverride.php
@@ -6,13 +6,29 @@
 
 class PHPMailerOverride extends \PHPMailer
 {
+    public function __construct($exceptions = null)
+    {
+        parent::__construct($exceptions);
+        $this->XMailer = 'PHPMailer (https://github.com/PHPMailer/PHPMailer)';
+    }
+
+    /**
+     * @return string
+     * @throws \ByJG\Mail\Exception\InvalidMessageFormatException
+     * @throws \phpmailerException
+     */
     public function getFullMessageEnvelope()
     {
         $parts = $this->getMessageEnvelopeParts();
 
         return $parts['header'] . $parts['body'];
     }
 
+    /**
+     * @return array
+     * @throws \ByJG\Mail\Exception\InvalidMessageFormatException
+     * @throws \phpmailerException
+     */
     public function getMessageEnvelopeParts()
     {
         if (!$this->preSend()) {

diff --git a/src/Util.php b/src/Util.php
@@ -41,7 +41,10 @@ public static function decomposeEmail($fullEmail)
             if (array_key_exists("email", $parts)) {
                 $email = $parts["email"];
             }
-        } else if (preg_match($pat2, $fullEmail, $parts)) {
+            return array("email" => $email, "name" => $name);
+        }
+
+        if (preg_match($pat2, $fullEmail, $parts)) {
             if (array_key_exists("email", $parts)) {
                 $email = $parts["email"];
             }

diff --git a/src/Wrapper/AmazonSesWrapper.php b/src/Wrapper/AmazonSesWrapper.php
@@ -29,6 +29,7 @@ public function getSesClient()
      *
      * @param Envelope $envelope
      * @return bool
+     * @throws \Exception
      */
     public function send(Envelope $envelope)
     {

diff --git a/src/Wrapper/BaseWrapper.php b/src/Wrapper/BaseWrapper.php
@@ -22,6 +22,10 @@ public function __construct(Uri $uri)
         $this->uri = $uri;
     }
 
+    /**
+     * @param \ByJG\Mail\Envelope $envelope
+     * @throws \Exception
+     */
     public function validate(Envelope $envelope)
     {
         if (0 === count($envelope->getTo())) {

diff --git a/src/Wrapper/MailgunApiWrapper.php b/src/Wrapper/MailgunApiWrapper.php
@@ -27,6 +27,8 @@ public function getRequestObject()
      * @param Envelope $envelope
      * @return bool
      * @throws \ByJG\Mail\Exception\MailApiException
+     * @throws \ByJG\Util\CurlException
+     * @throws \Exception
      */
     public function send(Envelope $envelope)
     {

diff --git a/src/Wrapper/PHPMailerWrapper.php b/src/Wrapper/PHPMailerWrapper.php
@@ -20,9 +20,9 @@ public function getMailer()
     }
 
     /**
-     *
      * @param Envelope $envelope
      * @return PHPMailerOverride
+     * @throws \phpmailerException
      */
     protected function prepareMailer(Envelope $envelope)
     {
@@ -95,6 +95,8 @@ protected function prepareMailer(Envelope $envelope)
      * @param Envelope $envelope
      * @return bool
      * @throws \ByJG\Mail\Exception\MailApiException
+     * @throws \Exception
+     * @throws \phpmailerException
      */
     public function send(Envelope $envelope)
     {

diff --git a/src/Wrapper/SendMailWrapper.php b/src/Wrapper/SendMailWrapper.php
@@ -14,6 +14,12 @@
 class SendMailWrapper extends PHPMailerWrapper
 {
 
+    /**
+     * @param \ByJG\Mail\Envelope $envelope
+     * @return bool
+     * @throws \ByJG\Mail\Exception\InvalidMessageFormatException
+     * @throws \Exception
+     */
     public function send(Envelope $envelope)
     {
         $this->validate($envelope);

diff --git a/tests/BaseWrapperTest.php b/tests/BaseWrapperTest.php
@@ -53,7 +53,7 @@ protected function fixVariableFields($text)
     {
         $text = preg_replace(
             [
-                '~\w+, \d+ \w+ \w+ \d+:\d+:\d+ \+\d+~',
+                '~\w+, \d+ \w+ \w+ \d+:\d+:\d+ [+-]\d+~',
                 '~([_<])\w{32}([@"\n-])~',
                 '~<boundarydelimiter@[^>]+>~'
             ],

diff --git a/tests/MailerWrapperTest.php b/tests/MailerWrapperTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace ByJG\Mail;
+
+use \PHPUnit\Framework\TestCase;
+use ByJG\Mail\Wrapper\AmazonSesWrapper;
+use ByJG\Mail\Wrapper\MailgunApiWrapper;
+use ByJG\Mail\Wrapper\PHPMailerWrapper;
+use ByJG\Mail\Wrapper\SendMailWrapper;
+
+// backward compatibility
+if (!class_exists('\PHPUnit\Framework\TestCase')) {
+    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+}
+
+class MailerWrapperTest extends TestCase
+{
+
+    /**
+     * @throws \ByJG\Mail\Exception\InvalidMailHandlerException
+     */
+    public function testRegisterMailer()
+    {
+        MailerFactory::registerMailer('smtp', PHPMailerWrapper::class);
+        MailerFactory::registerMailer('tls', PHPMailerWrapper::class);
+        MailerFactory::registerMailer('ssl', PHPMailerWrapper::class);
+        MailerFactory::registerMailer('sendmail', SendMailWrapper::class);
+        MailerFactory::registerMailer('mailgun', MailgunApiWrapper::class);
+        MailerFactory::registerMailer('ses', AmazonSesWrapper::class);
+    }
+
+    /**
+     * @throws \ByJG\Mail\Exception\InvalidMailHandlerException
+     * @expectedException \ByJG\Mail\Exception\InvalidMailHandlerException
+     */
+    public function testRegisterMailerFail()
+    {
+        MailerFactory::registerMailer('some', '\\Non\\Existant\\Class');
+    }
+
+    /**
+     * @throws \ByJG\Mail\Exception\InvalidMailHandlerException
+     * @throws \ByJG\Mail\Exception\ProtocolNotRegisteredException
+     */
+    public function testCreate()
+    {
+        MailerFactory::registerMailer('smtp', PHPMailerWrapper::class);
+        MailerFactory::create('smtp://localhost');
+    }
+
+    /**
+     * @throws \ByJG\Mail\Exception\ProtocolNotRegisteredException
+     * @expectedException \ByJG\Mail\Exception\ProtocolNotRegisteredException
+     * @throws \ByJG\Mail\Exception\InvalidMailHandlerException
+     */
+    public function testCreateFail()
+    {
+        MailerFactory::registerMailer('smtp', PHPMailerWrapper::class);
+        MailerFactory::create('some://localhost');
+    }
+}
diff --git a/tests/resources/attachmentenvelope.txt b/tests/resources/attachmentenvelope.txt
@@ -5,7 +5,7 @@ Cc: cc1@email.com, cc2@email.com
 Reply-To: from@email.com
 Subject: Subject
 Message-ID: <90dfa8c5628ceef4d0579b59b42b784c@jg-Latitude-E6520>
-X-Mailer: PHPMailer 5.2.23 (https://github.com/PHPMailer/PHPMailer)
+X-Mailer: PHPMailer (https://github.com/PHPMailer/PHPMailer)
 Bcc: bcc1@email.com
 Bcc: bcc2@email.com
 MIME-Version: 1.0

diff --git a/tests/resources/basicenvelope.txt b/tests/resources/basicenvelope.txt
@@ -4,7 +4,7 @@ From: from@email.com
 Reply-To: from@email.com
 Subject: Subject
 Message-ID: <90dfa8c5628ceef4d0579b59b42b784c@jg-Latitude-E6520>
-X-Mailer: PHPMailer 5.2.23 (https://github.com/PHPMailer/PHPMailer)
+X-Mailer: PHPMailer (https://github.com/PHPMailer/PHPMailer)
 MIME-Version: 1.0
 Content-Type: multipart/alternative;
 	boundary="b1_90dfa8c5628ceef4d0579b59b42b784c"

diff --git a/tests/resources/embedenvelope.txt b/tests/resources/embedenvelope.txt
@@ -5,7 +5,7 @@ Cc: cc1@email.com, cc2@email.com
 Reply-To: from@email.com
 Subject: Subject
 Message-ID: <90dfa8c5628ceef4d0579b59b42b784c@jg-Latitude-E6520>
-X-Mailer: PHPMailer 5.2.23 (https://github.com/PHPMailer/PHPMailer)
+X-Mailer: PHPMailer (https://github.com/PHPMailer/PHPMailer)
 Bcc: bcc1@email.com
 Bcc: bcc2@email.com
 MIME-Version: 1.0

diff --git a/tests/resources/fullenvelope.txt b/tests/resources/fullenvelope.txt
@@ -5,7 +5,7 @@ Cc: cc1@email.com, cc2@email.com
 Reply-To: from@email.com
 Subject: Subject
 Message-ID: <90dfa8c5628ceef4d0579b59b42b784c@jg-Latitude-E6520>
-X-Mailer: PHPMailer 5.2.23 (https://github.com/PHPMailer/PHPMailer)
+X-Mailer: PHPMailer (https://github.com/PHPMailer/PHPMailer)
 Bcc: bcc1@email.com
 Bcc: bcc2@email.com
 MIME-Version: 1.0