nfephp-org / sped-mail

src/Mail.php

Doc Comments +1 added lines, -3 removed lines

@@ -206,6 +206,4 @@
         $mail->loadDocuments($xml, $pdf);
         $mail->loadTemplate($htmltemplate);
         $mail->send($addresses, false);
-        return $mail;
-    }
-}
+        return $mail
\ No newline at end of file

Unused Use Statements +1 added lines, -3 removed lines

@@ -206,6 +206,4 @@
         $mail->loadDocuments($xml, $pdf);
         $mail->loadTemplate($htmltemplate);
         $mail->send($addresses, false);
-        return $mail;
-    }
-}
+        return $mail
\ No newline at end of file

Indentation +1 added lines, -3 removed lines

@@ -206,6 +206,4 @@
         $mail->loadDocuments($xml, $pdf);
         $mail->loadTemplate($htmltemplate);
         $mail->send($addresses, false);
-        return $mail;
-    }
-}
+        return $mail
\ No newline at end of file

Switch Indentation +1 added lines, -3 removed lines

@@ -206,6 +206,4 @@
         $mail->loadDocuments($xml, $pdf);
         $mail->loadTemplate($htmltemplate);
         $mail->send($addresses, false);
-        return $mail;
-    }
-}
+        return $mail
\ No newline at end of file

Spacing +2 added lines, -4 removed lines

@@ -82,7 +82,7 @@ 
         if (!empty($config->timelimit)) {
             $this->mail->Timelimit = $config->timelimit;
         }
-<<<<<<< HEAD
+<< << <<< HEAD
         if (isset($config->smtpoptions) && is_array($config->smtpoptions)) {
 =======
         if (is_array($config->smtpoptions)) {
@@ -206,6 +206,4 @@ 
         $mail->loadDocuments($xml, $pdf);
         $mail->loadTemplate($htmltemplate);
         $mail->send($addresses, false);
-        return $mail;
-    }
-}
+        return $mail
\ No newline at end of file

Braces +1 added lines, -3 removed lines

@@ -206,6 +206,4 @@
         $mail->loadDocuments($xml, $pdf);
         $mail->loadTemplate($htmltemplate);
         $mail->send($addresses, false);
-        return $mail;
-    }
-}
+        return $mail
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -3 removed lines

@@ -206,6 +206,4 @@
         $mail->loadDocuments($xml, $pdf);
         $mail->loadTemplate($htmltemplate);
         $mail->send($addresses, false);
-        return $mail;
-    }
-}
+        return $mail
\ No newline at end of file