@@ -40,6 +40,5 @@ |
||
40 | 40 | * Class MailException |
41 | 41 | * @package Platine\Mail\Exception |
42 | 42 | */ |
43 | -class MailException extends Exception |
|
44 | -{ |
|
43 | +class MailException extends Exception { |
|
45 | 44 | } |
@@ -40,6 +40,5 @@ |
||
40 | 40 | * Class FileTransportException |
41 | 41 | * @package Platine\Mail\Exception |
42 | 42 | */ |
43 | -class FileTransportException extends Exception |
|
44 | -{ |
|
43 | +class FileTransportException extends Exception { |
|
45 | 44 | } |
@@ -38,16 +38,14 @@ |
||
38 | 38 | * Class SMTPRetunCodeException |
39 | 39 | * @package Platine\Mail\Exception |
40 | 40 | */ |
41 | -class SMTPRetunCodeException extends SMTPException |
|
42 | -{ |
|
41 | +class SMTPRetunCodeException extends SMTPException { |
|
43 | 42 | /** |
44 | 43 | * Create new instance |
45 | 44 | * @param int $expected |
46 | 45 | * @param int $received |
47 | 46 | * @param string|null $serverMessage |
48 | 47 | */ |
49 | - public function __construct(int $expected, int $received, ?string $serverMessage = null) |
|
50 | - { |
|
48 | + public function __construct(int $expected, int $received, ?string $serverMessage = null) { |
|
51 | 49 | $message = sprintf( |
52 | 50 | 'Unexpected return code expected %d, but got %d', |
53 | 51 | $expected, |
@@ -38,6 +38,5 @@ |
||
38 | 38 | * Class SMTPException |
39 | 39 | * @package Platine\Mail\Exception |
40 | 40 | */ |
41 | -class SMTPSecureException extends SMTPException |
|
42 | -{ |
|
41 | +class SMTPSecureException extends SMTPException { |
|
43 | 42 | } |
@@ -40,6 +40,5 @@ |
||
40 | 40 | * Class SMTPException |
41 | 41 | * @package Platine\Mail\Exception |
42 | 42 | */ |
43 | -class SMTPException extends Exception |
|
44 | -{ |
|
43 | +class SMTPException extends Exception { |
|
45 | 44 | } |
@@ -182,18 +182,18 @@ discard block |
||
182 | 182 | $this->message = $message; |
183 | 183 | |
184 | 184 | $this->connect() |
185 | - ->ehlo(); |
|
185 | + ->ehlo(); |
|
186 | 186 | |
187 | 187 | if ($this->tls) { |
188 | 188 | $this->starttls() |
189 | - ->ehlo(); |
|
189 | + ->ehlo(); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | $this->authLogin() |
193 | - ->mailFrom() |
|
194 | - ->rcptTo() |
|
195 | - ->data() |
|
196 | - ->quit(); |
|
193 | + ->mailFrom() |
|
194 | + ->rcptTo() |
|
195 | + ->data() |
|
196 | + ->quit(); |
|
197 | 197 | |
198 | 198 | if (is_resource($this->smtp)) { |
199 | 199 | return fclose($this->smtp); |
@@ -221,11 +221,11 @@ discard block |
||
221 | 221 | } |
222 | 222 | |
223 | 223 | /** |
224 | - * Connect to server |
|
225 | - * @return $this |
|
226 | - * @throws SMTPException |
|
227 | - * @throws SMTPRetunCodeException |
|
228 | - */ |
|
224 | + * Connect to server |
|
225 | + * @return $this |
|
226 | + * @throws SMTPException |
|
227 | + * @throws SMTPRetunCodeException |
|
228 | + */ |
|
229 | 229 | protected function connect(): self |
230 | 230 | { |
231 | 231 | $host = $this->ssl ? 'ssl://' . $this->host : $this->host; |
@@ -257,14 +257,14 @@ discard block |
||
257 | 257 | } |
258 | 258 | |
259 | 259 | /** |
260 | - * STREAM_CRYPTO_METHOD_TLS_CLIENT is quite the mess ... |
|
261 | - * |
|
262 | - * - On PHP <5.6 it doesn't even mean TLS, but SSL 2.0, and there's no option to use actual TLS |
|
263 | - * - On PHP 5.6.0-5.6.6, >=7.2 it means negotiation with any of TLS 1.0, 1.1, 1.2 |
|
264 | - * - On PHP 5.6.7-7.1.* it means only TLS 1.0 |
|
265 | - * |
|
266 | - * We want the negotiation, so we'll force it below ... |
|
267 | - */ |
|
260 | + * STREAM_CRYPTO_METHOD_TLS_CLIENT is quite the mess ... |
|
261 | + * |
|
262 | + * - On PHP <5.6 it doesn't even mean TLS, but SSL 2.0, and there's no option to use actual TLS |
|
263 | + * - On PHP 5.6.0-5.6.6, >=7.2 it means negotiation with any of TLS 1.0, 1.1, 1.2 |
|
264 | + * - On PHP 5.6.7-7.1.* it means only TLS 1.0 |
|
265 | + * |
|
266 | + * We want the negotiation, so we'll force it below ... |
|
267 | + */ |
|
268 | 268 | if (is_resource($this->smtp)) { |
269 | 269 | if ( |
270 | 270 | !stream_socket_enable_crypto( |
@@ -57,8 +57,7 @@ |
||
57 | 57 | * Class SMTP |
58 | 58 | * @package Platine\Mail\Transport |
59 | 59 | */ |
60 | -class SMTP implements TransportInterface |
|
61 | -{ |
|
60 | +class SMTP implements TransportInterface { |
|
62 | 61 | /** |
63 | 62 | * End of line char |
64 | 63 | */ |
@@ -86,7 +86,7 @@ |
||
86 | 86 | )); |
87 | 87 | } |
88 | 88 | |
89 | - $content = (string)$message; |
|
89 | + $content = (string) $message; |
|
90 | 90 | $file = $this->path . date('YmdHis') . '-' . md5(uniqid()) . '.txt'; |
91 | 91 | if (!file_put_contents($file, $content)) { |
92 | 92 | throw new FileTransportException(sprintf( |
@@ -55,8 +55,7 @@ discard block |
||
55 | 55 | * Class File |
56 | 56 | * @package Platine\Mail\Transport |
57 | 57 | */ |
58 | -class File implements TransportInterface |
|
59 | -{ |
|
58 | +class File implements TransportInterface { |
|
60 | 59 | /** |
61 | 60 | * |
62 | 61 | * @var string |
@@ -67,8 +66,7 @@ discard block |
||
67 | 66 | * Create new instance |
68 | 67 | * @param string|null $path |
69 | 68 | */ |
70 | - public function __construct(?string $path = null) |
|
71 | - { |
|
69 | + public function __construct(?string $path = null) { |
|
72 | 70 | if ($path === null) { |
73 | 71 | $path = sys_get_temp_dir(); |
74 | 72 | } |
@@ -78,7 +78,7 @@ |
||
78 | 78 | */ |
79 | 79 | public function send(MessageInterface $message): bool |
80 | 80 | { |
81 | - $content = (string)$message; |
|
81 | + $content = (string) $message; |
|
82 | 82 | |
83 | 83 | $from = $message->getFrom(); |
84 | 84 |
@@ -55,8 +55,7 @@ discard block |
||
55 | 55 | * Class Sendmail |
56 | 56 | * @package Platine\Mail\Transport |
57 | 57 | */ |
58 | -class Sendmail implements TransportInterface |
|
59 | -{ |
|
58 | +class Sendmail implements TransportInterface { |
|
60 | 59 | /** |
61 | 60 | * |
62 | 61 | * @var string |
@@ -67,8 +66,7 @@ discard block |
||
67 | 66 | * Create new instance |
68 | 67 | * @param string $path |
69 | 68 | */ |
70 | - public function __construct(string $path = '/usr/sbin/sendmail') |
|
71 | - { |
|
69 | + public function __construct(string $path = '/usr/sbin/sendmail') { |
|
72 | 70 | $this->path = $path; |
73 | 71 | } |
74 | 72 |
@@ -104,16 +104,16 @@ discard block |
||
104 | 104 | */ |
105 | 105 | protected string $body = ''; |
106 | 106 | |
107 | - /** |
|
108 | - * The mail attachments |
|
109 | - * @var array<int, array<string, string>> |
|
110 | - */ |
|
107 | + /** |
|
108 | + * The mail attachments |
|
109 | + * @var array<int, array<string, string>> |
|
110 | + */ |
|
111 | 111 | protected array $attachments = []; |
112 | 112 | |
113 | - /** |
|
114 | - * The mail headers |
|
115 | - * @var array<string, mixed> |
|
116 | - */ |
|
113 | + /** |
|
114 | + * The mail headers |
|
115 | + * @var array<string, mixed> |
|
116 | + */ |
|
117 | 117 | protected array $headers = []; |
118 | 118 | |
119 | 119 | /** |
@@ -286,8 +286,8 @@ discard block |
||
286 | 286 | } |
287 | 287 | |
288 | 288 | /** |
289 | - * {@inheritedoc} |
|
290 | - */ |
|
289 | + * {@inheritedoc} |
|
290 | + */ |
|
291 | 291 | public function setReplyTo(string $email, ?string $name = null): self |
292 | 292 | { |
293 | 293 | $this->replyTo = $this->formatHeader($email, $name); |
@@ -461,17 +461,17 @@ discard block |
||
461 | 461 | } |
462 | 462 | |
463 | 463 | $this->addHeader('X-Priority', $this->priority) |
464 | - ->addHeader('X-Mailer', 'Platine PHP Mail') |
|
465 | - ->addHeader('Subject', $this->subject) |
|
466 | - ->addHeader('To', join(', ', $this->to)) |
|
467 | - ->addHeader('Date', date('r')); |
|
464 | + ->addHeader('X-Mailer', 'Platine PHP Mail') |
|
465 | + ->addHeader('Subject', $this->subject) |
|
466 | + ->addHeader('To', join(', ', $this->to)) |
|
467 | + ->addHeader('Date', date('r')); |
|
468 | 468 | |
469 | 469 | if ($this->hasAttachments()) { |
470 | 470 | $this->addHeader('MIME-Version', '1.0') |
471 | - ->addHeader( |
|
472 | - 'Content-Type', |
|
473 | - sprintf('multipart/mixed; boundary="%s"', $this->uid) |
|
474 | - ); |
|
471 | + ->addHeader( |
|
472 | + 'Content-Type', |
|
473 | + sprintf('multipart/mixed; boundary="%s"', $this->uid) |
|
474 | + ); |
|
475 | 475 | } |
476 | 476 | |
477 | 477 | return $this; |
@@ -573,7 +573,7 @@ discard block |
||
573 | 573 | protected function filterEmail(string $email): string |
574 | 574 | { |
575 | 575 | $rules = [ |
576 | - "\r" => '', |
|
576 | + "\r" => '', |
|
577 | 577 | "\n" => '', |
578 | 578 | "\t" => '', |
579 | 579 | '"' => '', |
@@ -596,7 +596,7 @@ discard block |
||
596 | 596 | protected function filterName(string $name): string |
597 | 597 | { |
598 | 598 | $rules = [ |
599 | - "\r" => '', |
|
599 | + "\r" => '', |
|
600 | 600 | "\n" => '', |
601 | 601 | "\t" => '', |
602 | 602 | '"' => "'", |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $this->body = ''; |
157 | 157 | $this->attachments = []; |
158 | 158 | $this->headers = []; |
159 | - $this->uid = md5(uniqid((string)time())); |
|
159 | + $this->uid = md5(uniqid((string) time())); |
|
160 | 160 | $this->wrap = 70; |
161 | 161 | $this->priority = 3; |
162 | 162 | |
@@ -639,7 +639,7 @@ discard block |
||
639 | 639 | */ |
640 | 640 | protected function encodeUtf8(?string $value): string |
641 | 641 | { |
642 | - $value = trim((string)$value); |
|
642 | + $value = trim((string) $value); |
|
643 | 643 | if (preg_match('/(\s)/', $value)) { |
644 | 644 | return $this->encodeUtf8Words($value); |
645 | 645 | } |
@@ -54,8 +54,7 @@ discard block |
||
54 | 54 | * Class Message |
55 | 55 | * @package Platine\Mail |
56 | 56 | */ |
57 | -class Message implements MessageInterface |
|
58 | -{ |
|
57 | +class Message implements MessageInterface { |
|
59 | 58 | /** |
60 | 59 | * End of line char |
61 | 60 | */ |
@@ -136,8 +135,7 @@ discard block |
||
136 | 135 | /** |
137 | 136 | * Create new instance |
138 | 137 | */ |
139 | - public function __construct() |
|
140 | - { |
|
138 | + public function __construct() { |
|
141 | 139 | $this->reset(); |
142 | 140 | } |
143 | 141 | |
@@ -369,8 +367,7 @@ discard block |
||
369 | 367 | /** |
370 | 368 | * {@inheritedoc} |
371 | 369 | */ |
372 | - public function getHeader(string $name, $default = null) |
|
373 | - { |
|
370 | + public function getHeader(string $name, $default = null) { |
|
374 | 371 | $this->prepareHeaders(); |
375 | 372 | |
376 | 373 | return array_key_exists($name, $this->headers) |