Better maintability.

src/Emailer.php

@@ -83,7 +83,8 @@ public function send(NetteMessage $mail): void
 
 	public function sendNow(NetteMessage $message): void
 	{
-		if (($email = $this->insertMessageToQueue($message)) !== null) {
+		$email = $this->insertMessageToQueue($message);
+		if ($email !== null) {
 			if ($email->getStatus() === Email::STATUS_SENT) {
 				return;
 			}
@@ -119,7 +120,8 @@ public function sendMessageToAdministrators(string $subject, string $message, ?a
 						$url = Url::get()->getCurrentUrl();
 
 						return '<p>URL: <a href="' . $url . '" target="_blank">' . $url . '</a></p>';
-					} catch (\Throwable $e) {
+					} catch (\Throwable) {
+						// Silence is golden.
 					}
 					if (isset($_SERVER['argv'][0])) {
 						return '<p>CRON - ARGS: ' . implode(' | ', $_SERVER['argv']) . '</p>';
@@ -174,8 +176,11 @@ public function getEmailServiceByType(
 			$locale = $this->localization->getDefaultLocale();
 		}
 
-		if (($templatePath = $email->getTemplate($locale)) === null) {
-			throw new EmailerException('Email template for mail "' . $type . '" and locale "' . $locale . '" does not exist.');
+		$templatePath = $email->getTemplate($locale);
+		if ($templatePath === null) {
+			throw new EmailerException(
+				'Email template for mail "' . $type . '" and locale "' . $locale . '" does not exist.',
+			);
 		}
 
 		$subject = $parameters['subject'] ?? $message->getSubject();
@@ -189,7 +194,11 @@ public function getEmailServiceByType(
 
 		$from = $parameters['from']
 			?? $this->configuration->getDefaultFrom()
-			?? throw new \InvalidArgumentException('Parameter "from" does not exist. Did you defined default configuration?');
+			?? null;
+
+		if ($from === null) {
+			throw new \InvalidArgumentException('Parameter "from" does not exist. Did you defined default configuration?');
+		}
 
 		$message->setFrom($this->fixer->fix($from));
 		if (isset($parameters['to']) === true) {
@@ -287,15 +296,17 @@ private function insertMessageToQueue(NetteMessage $message, string $sendEarlies
 		$email = new Email($this->messageEntity->toEntity($message));
 		try {
 			$email->setLocale($this->localization->getLocale());
-		} catch (\Throwable $e) {
+		} catch (\Throwable) {
+			// Locale should be unknown
 		}
 		if ($sendEarliestAt !== 'now') {
 			$email->setSendEarliestAt(DateTime::from($sendEarliestAt));
 		} elseif ($message instanceof Message) {
 			$email->setSendEarliestAt($message->getSendEarliestAt());
 		}
 
-		$this->entityManager->persist($email)->flush();
+		$this->entityManager->persist($email);
+		$this->entityManager->flush();
 
 		return $email;
 	}

src/EmailerExtension.php

@@ -14,6 +14,8 @@
 use Nette\Schema\Expect;
 use Nette\Schema\Schema;
 use Nette\Utils\FileSystem;
+use Tracy\Debugger;
+use Tracy\ILogger;
 
 final class EmailerExtension extends CompilerExtension
 {
@@ -53,6 +55,10 @@ public function beforeCompile(): void
 			$dicMailConfiguration = $netteMailerArguments;
 			$builder->removeDefinition('mail.mailer');
 		} catch (MissingServiceException $e) {
+			Debugger::log(
+				new \LogicException('Mailer is broken: ' . $e->getMessage(), $e->getCode(), $e),
+				ILogger::EXCEPTION,
+			);
 		}
 
 		/** @var mixed[] $config */

src/EmailerLogger.php

@@ -22,7 +22,7 @@ public function __construct(
 	 */
 	public function log(string $level, string $message, ?Email $email = null): void
 	{
-		$this->entityManager->persist($log = new Log($level, $message, $email));
+		$this->entityManager->persist(new Log($level, $message, $email));
 		$this->entityManager->flush();
 	}
 }

src/Entity/Log.php

@@ -48,8 +48,9 @@ class Log
 
 	public function __construct(string $level, string $message, ?Email $email = null)
 	{
-		if (\in_array($level = strtoupper($level), [self::LEVEL_WARNING, self::LEVEL_ERROR, self::LEVEL_INFO], true) === false) {
-			trigger_error('Log: Level "' . $level . '" is not supported.');
+		$level = strtoupper($level);
+		if (\in_array($level, [self::LEVEL_WARNING, self::LEVEL_ERROR, self::LEVEL_INFO], true) === false) {
+			trigger_error(__METHOD__ . ': Level "' . $level . '" is not supported.');
 			$level = self::LEVEL_ERROR;
 		}
 

src/Helper.php

@@ -16,11 +16,11 @@ public function __construct()
 
 	public static function formatDurationFrom(int $fromMicroTime, ?int $nowMicroTime = null): string
 	{
-		if (($microTime = ($nowMicroTime ?: (int) microtime(true)) - $fromMicroTime) >= 1) {
-			return number_format($microTime, 3, '.', ' ') . ' s';
-		}
+		$microTime = ($nowMicroTime ?: (int) microtime(true)) - $fromMicroTime;
 
-		return number_format($microTime * 1_000, 2, '.', ' ') . ' ms';
+		return $microTime >= 1
+			? number_format($microTime, 3, '.', ' ') . ' s'
+			: number_format($microTime * 1_000, 2, '.', ' ') . ' ms';
 	}
 
 
@@ -39,8 +39,11 @@ public static function userIp(): string
 			if (isset($_SERVER['REMOTE_ADDR'])) {
 				if (\in_array($_SERVER['REMOTE_ADDR'], ['::1', '0.0.0.0', 'localhost'], true)) {
 					$ip = '127.0.0.1';
-				} elseif (($ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) === false) {
-					$ip = '127.0.0.1';
+				} else {
+					$ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
+					if ($ip === false) {
+						$ip = '127.0.0.1';
+					}
 				}
 			} else {
 				$ip = '127.0.0.1';

src/Renderer/BaseTemplateRenderer.php

@@ -51,7 +51,7 @@ final public function getDefaultParameters(): array
 	{
 		try {
 			$locale = $this->localization->getLocale();
-		} catch (\Throwable $e) {
+		} catch (\Throwable) {
 			$locale = $this->localization->getDefaultLocale();
 		}
 

src/Send/QueueRunner.php

@@ -13,6 +13,7 @@
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Nette\Mail\SendException;
 use Tracy\Debugger;
+use Tracy\ILogger;
 
 final class QueueRunner
 {
@@ -81,7 +82,7 @@ public function run(): int
 				$result++;
 			} catch (\Throwable $e) {
 				echo 'E';
-				Debugger::log($e);
+				Debugger::log($e, ILogger::CRITICAL);
 
 				$this->logger->log(Log::LEVEL_ERROR, 'Failed to send: ' . $e->getMessage() . ', details on Tracy logger.', $email);