cs whitespace

Author: dg

src/Mail/DkimSigner.php

@@ -50,6 +50,7 @@ public function __construct(array $options, array $signHeaders = self::DEFAULT_S
 		if (!extension_loaded('openssl')) {
 			throw new Nette\NotSupportedException('DkimSigner requires PHP extension openssl which is not loaded.');
 		}
+
 		$this->domain = $options['domain'] ?? '';
 		$this->selector = $options['selector'] ?? '';
 		$this->privateKey = $options['privateKey'] ?? '';
@@ -70,6 +71,7 @@ public function generateSignedMessage(Message $message): string
 
 			return rtrim($header, "\r\n") . "\r\n" . $this->getSignature($message, $header, $this->normalizeNewLines($body)) . "\r\n\r\n" . $body;
 		}
+
 		throw new SignException('Malformed email');
 	}
 
@@ -136,11 +138,14 @@ protected function sign(string $value): string
 			if (PHP_VERSION_ID < 80000) {
 				openssl_pkey_free($privateKey);
 			}
+
 			return base64_encode($signature);
 		}
+
 		if (PHP_VERSION_ID < 80000) {
 			openssl_pkey_free($privateKey);
 		}
+
 		return '';
 	}
 

src/Mail/Message.php

@@ -48,6 +48,7 @@ public function __construct()
 		foreach (static::$defaultHeaders as $name => $value) {
 			$this->setHeader($name, $value);
 		}
+
 		$this->setHeader('Date', date('r'));
 	}
 
@@ -149,6 +150,7 @@ private function formatEmail(string $email, string $name = null): array
 				$name = $tmp;
 			}
 		}
+
 		return [$email => $name];
 	}
 
@@ -219,6 +221,7 @@ public function setHtmlBody(string $html, string $basePath = null)
 				if (!isset($cids[$file])) {
 					$cids[$file] = substr($this->addEmbeddedFile($file)->getHeader('Content-ID'), 1, -1);
 				}
+
 				$html = substr_replace(
 					$html,
 					"{$m[1][0]}{$m[2][0]}cid:{$cids[$file]}",
@@ -307,9 +310,11 @@ private function createAttachment(
 			$content = Nette\Utils\FileSystem::read($file);
 			$file = Strings::fixEncoding(basename($file));
 		}
+
 		if (!$contentType) {
 			$contentType = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $content);
 		}
+
 		if (!strcasecmp($contentType, 'message/rfc822')) { // not allowed for attached files
 			$contentType = 'application/octet-stream';
 		} elseif (!strcasecmp($contentType, 'image/svg')) { // Troublesome for some mailers...
@@ -365,6 +370,7 @@ public function build()
 					$tmp->addPart($value);
 				}
 			}
+
 			$alt->setContentType('text/html', 'UTF-8')
 				->setEncoding(preg_match('#[^\n]{990}#', $mail->htmlBody)
 					? self::ENCODING_QUOTED_PRINTABLE

src/Mail/MimePart.php

@@ -63,7 +63,6 @@ public function setHeader(string $name, $value, bool $append = false)
 			if (!$append) {
 				unset($this->headers[$name]);
 			}
-
 		} elseif (is_array($value)) { // email
 			$tmp = &$this->headers[$name];
 			if (!$append || !is_array($tmp)) {
@@ -78,17 +77,19 @@ public function setHeader(string $name, $value, bool $append = false)
 				} elseif (preg_match('#[\r\n]#', $recipient)) {
 					throw new Nette\InvalidArgumentException('Name must not contain line separator.');
 				}
+
 				Nette\Utils\Validators::assert($email, 'email', "header '$name'");
 				$tmp[$email] = $recipient;
 			}
-
 		} else {
 			$value = (string) $value;
 			if (!Strings::checkEncoding($value)) {
 				throw new Nette\InvalidArgumentException('Header is not valid UTF-8 string.');
 			}
+
 			$this->headers[$name] = preg_replace('#[\r\n]+#', ' ', $value);
 		}
+
 		return $this;
 	}
 
@@ -131,8 +132,10 @@ public function getEncodedHeader(string $name): ?string
 					$s .= self::encodeSequence($name, $offset, self::SEQUENCE_WORD);
 					$email = " <$email>";
 				}
+
 				$s .= self::append($email . ',', $offset);
 			}
+
 			return ltrim(substr($s, 0, -1)); // last comma
 
 		} elseif (preg_match('#^(\S+; (?:file)?name=)"(.*)"$#D', $this->headers[$name], $m)) { // Content-Disposition
@@ -230,8 +233,10 @@ public function getEncodedMessage(): string
 			if ($this->parts && $name === 'Content-Type') {
 				$output .= ';' . self::EOL . "\tboundary=\"$boundary\"";
 			}
+
 			$output .= self::EOL;
 		}
+
 		$output .= self::EOL;
 
 		$body = $this->body;
@@ -264,9 +269,11 @@ public function getEncodedMessage(): string
 			if (substr($output, -strlen(self::EOL)) !== self::EOL) {
 				$output .= self::EOL;
 			}
+
 			foreach ($this->parts as $part) {
 				$output .= '--' . $boundary . self::EOL . $part->getEncodedMessage() . self::EOL;
 			}
+
 			$output .= '--' . $boundary . '--';
 		}
 
@@ -289,6 +296,7 @@ private static function encodeSequence(string $s, int &$offset = 0, int $type =
 			if ($type && preg_match('#[^ a-zA-Z0-9!\#$%&\'*+/?^_`{|}~-]#', $s)) { // RFC 2822 atext except =
 				return self::append('"' . addcslashes($s, '"\\') . '"', $offset);
 			}
+
 			return self::append($s, $offset);
 		}
 
@@ -309,6 +317,7 @@ private static function encodeSequence(string $s, int &$offset = 0, int $type =
 		if ($type === self::SEQUENCE_VALUE) {
 			$s = '"' . $s . '"';
 		}
+
 		$s = str_replace("\n ", "\n\t", $s);
 		return $o . $s;
 	}
@@ -320,6 +329,7 @@ private static function append(string $s, int &$offset = 0): string
 			$offset = 1;
 			$s = self::EOL . "\t" . $s;
 		}
+
 		$offset += strlen($s);
 		return $s;
 	}

src/Mail/SendmailMailer.php

@@ -43,6 +43,7 @@ public function send(Message $mail): void
 		if (!function_exists('mail')) {
 			throw new SendException('Unable to send email: mail() has been disabled.');
 		}
+
 		$tmp = clone $mail;
 		$tmp->setHeader('Subject', null);
 		$tmp->setHeader('To', null);
@@ -61,6 +62,7 @@ public function send(Message $mail): void
 		if ($this->commandArgs) {
 			$args[] = $this->commandArgs;
 		}
+
 		$res = Nette\Utils\Callback::invokeSafe('mail', $args, function (string $message) use (&$info): void {
 			$info = ": $message";
 		});

src/Mail/SmtpMailer.php

@@ -64,6 +64,7 @@ public function __construct(array $options = [])
 			$this->host = ini_get('SMTP');
 			$this->port = (int) ini_get('smtp_port');
 		}
+
 		$this->username = $options['username'] ?? '';
 		$this->password = $options['password'] ?? '';
 		$this->secure = $options['secure'] ?? '';
@@ -76,6 +77,7 @@ public function __construct(array $options = [])
 		if (!$this->port) {
 			$this->port = $this->secure === 'ssl' ? 465 : 25;
 		}
+
 		$this->persistent = !empty($options['persistent']);
 		if (isset($options['clientHost'])) {
 			$this->clientHost = $options['clientHost'];
@@ -141,6 +143,7 @@ public function send(Message $mail): void
 			if ($this->connection) {
 				$this->disconnect();
 			}
+
 			throw $e;
 		}
 	}
@@ -162,6 +165,7 @@ protected function connect(): void
 		if (!$this->connection) {
 			throw new SmtpException($error ?: error_get_last()['message'], $errno);
 		}
+
 		stream_set_timeout($this->connection, $this->timeout, 0);
 		$this->read(); // greeting
 
@@ -175,12 +179,12 @@ protected function connect(): void
 			)) {
 				throw new SmtpException('Unable to connect via TLS.');
 			}
+
 			$this->write("EHLO $this->clientHost");
 			$ehloResponse = $this->read();
 			if ((int) $ehloResponse !== 250) {
 				throw new SmtpException('SMTP server did not accept EHLO with error: ' . trim($ehloResponse));
 			}
-
 		} else {
 			$this->write("EHLO $this->clientHost");
 			$ehloResponse = $this->read();
@@ -247,6 +251,7 @@ protected function read(): string
 				break;
 			}
 		}
+
 		return $s;
 	}
 }