Completed
Pull Request — master (#58)
by
unknown
06:46
created
src/Mail.php 7 patches
Doc Comments   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -206,6 +206,4 @@
 block discarded – undo
206 206
         $mail->loadDocuments($xml, $pdf);
207 207
         $mail->loadTemplate($htmltemplate);
208 208
         $mail->send($addresses, false);
209
-        return $mail;
210
-    }
211
-}
209
+        return $mail
212 210
\ No newline at end of file
Please login to merge, or discard this patch.
Unused Use Statements   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -206,6 +206,4 @@
 block discarded – undo
206 206
         $mail->loadDocuments($xml, $pdf);
207 207
         $mail->loadTemplate($htmltemplate);
208 208
         $mail->send($addresses, false);
209
-        return $mail;
210
-    }
211
-}
209
+        return $mail
212 210
\ No newline at end of file
Please login to merge, or discard this patch.
Indentation   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -206,6 +206,4 @@
 block discarded – undo
206 206
         $mail->loadDocuments($xml, $pdf);
207 207
         $mail->loadTemplate($htmltemplate);
208 208
         $mail->send($addresses, false);
209
-        return $mail;
210
-    }
211
-}
209
+        return $mail
212 210
\ No newline at end of file
Please login to merge, or discard this patch.
Switch Indentation   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -206,6 +206,4 @@
 block discarded – undo
206 206
         $mail->loadDocuments($xml, $pdf);
207 207
         $mail->loadTemplate($htmltemplate);
208 208
         $mail->send($addresses, false);
209
-        return $mail;
210
-    }
211
-}
209
+        return $mail
212 210
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
         if (!empty($config->timelimit)) {
83 83
             $this->mail->Timelimit = $config->timelimit;
84 84
         }
85
-<<<<<<< HEAD
85
+<< << <<< HEAD
86 86
         if (isset($config->smtpoptions) && is_array($config->smtpoptions)) {
87 87
 =======
88 88
         if (is_array($config->smtpoptions)) {
@@ -206,6 +206,4 @@  discard block
 block discarded – undo
206 206
         $mail->loadDocuments($xml, $pdf);
207 207
         $mail->loadTemplate($htmltemplate);
208 208
         $mail->send($addresses, false);
209
-        return $mail;
210
-    }
211
-}
209
+        return $mail
212 210
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -206,6 +206,4 @@
 block discarded – undo
206 206
         $mail->loadDocuments($xml, $pdf);
207 207
         $mail->loadTemplate($htmltemplate);
208 208
         $mail->send($addresses, false);
209
-        return $mail;
210
-    }
211
-}
209
+        return $mail
212 210
\ No newline at end of file
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -206,6 +206,4 @@
 block discarded – undo
206 206
         $mail->loadDocuments($xml, $pdf);
207 207
         $mail->loadTemplate($htmltemplate);
208 208
         $mail->send($addresses, false);
209
-        return $mail;
210
-    }
211
-}
209
+        return $mail
212 210
\ No newline at end of file
Please login to merge, or discard this patch.