Message::buildText(): Trim each text line.

.github/workflows/coding-style.yml

@@ -10,7 +10,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v1
               with:
-                  php-version: 7.1
+                  php-version: 8.0
                   coverage: none
 
             - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
@@ -24,7 +24,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v1
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
 
             - run: composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress

.github/workflows/static-analysis.yml

@@ -13,7 +13,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v1
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+                php: ['8.0']
 
             fail-fast: false
 
@@ -35,7 +35,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.1
+                  php-version: 8.0
                   coverage: none
 
             - run: composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable
@@ -49,7 +49,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

composer.json

@@ -15,14 +15,14 @@
 		}
 	],
 	"require": {
-		"php": ">=7.1 <8.1",
+		"php": ">=8.0 <8.1",
 		"ext-iconv": "*",
-		"nette/utils": "^3.1"
+		"nette/utils": "^3.2.1 || ^4.0"
 	},
 	"require-dev": {
-		"nette/di": "^3.0.0",
-		"nette/tester": "^2.0",
-		"tracy/tracy": "^2.4",
+		"nette/di": "^4.0",
+		"nette/tester": "^2.4",
+		"tracy/tracy": "^2.8",
 		"phpstan/phpstan-nette": "^0.12"
 	},
 	"conflict": {
@@ -42,7 +42,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.1-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

readme.md

@@ -33,7 +33,7 @@ Installation
 composer require nette/mail
 ```
 
-It requires PHP version 7.1 and supports PHP up to 8.0.
+It requires PHP version 8.0.
 
 
 Creating Emails

src/Bridges/MailDI/MailExtension.php

@@ -39,7 +39,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 					'privateKey' => Expect::string()->required(),
 					'passPhrase' => Expect::string()->dynamic(),
 					'testMode' => Expect::bool(false)->dynamic(),
-				])->castTo('array')
+				])->castTo('array'),
 			),
 		])->castTo('array');
 	}

src/Mail/DkimSigner.php

@@ -28,20 +28,15 @@ class DkimSigner implements Signer
 
 	private const DKIM_SIGNATURE = 'DKIM-Signature';
 
-	/** @var string */
-	private $domain;
+	private string $domain;
 
-	/** @var array */
-	private $signHeaders;
+	private array $signHeaders;
 
-	/** @var string */
-	private $selector;
+	private string $selector;
 
-	/** @var string */
-	private $privateKey;
+	private string $privateKey;
 
-	/** @var string */
-	private $passPhrase;
+	private string $passPhrase;
 
 
 	/** @throws Nette\NotSupportedException */
@@ -133,14 +128,8 @@ protected function sign(string $value): string
 		}
 
 		if (openssl_sign($value, $signature, $privateKey, 'sha256WithRSAEncryption')) {
-			if (PHP_VERSION_ID < 80000) {
-				openssl_pkey_free($privateKey);
-			}
 			return base64_encode($signature);
 		}
-		if (PHP_VERSION_ID < 80000) {
-			openssl_pkey_free($privateKey);
-		}
 		return '';
 	}
 
@@ -150,8 +139,8 @@ protected function computeBodyHash(string $body): string
 		return base64_encode(
 			pack(
 				'H*',
-				hash('sha256', $body)
-			)
+				hash('sha256', $body),
+			),
 		);
 	}
 
@@ -166,9 +155,7 @@ protected function normalizeNewLines(string $s): string
 
 	protected function getSignedHeaders(Message $message): array
 	{
-		return array_filter($this->signHeaders, function ($name) use ($message) {
-			return $message->getHeader($name) !== null;
-		});
+		return array_filter($this->signHeaders, fn($name) => $message->getHeader($name) !== null);
 	}
 
 

src/Mail/FallbackMailer.php

@@ -17,21 +17,19 @@ class FallbackMailer implements Mailer
 	use Nette\SmartObject;
 
 	/** @var callable[]  function (FallbackMailer $sender, SendException $e, Mailer $mailer, Message $mail): void */
-	public $onFailure;
+	public array $onFailure = [];
 
 	/** @var Mailer[] */
-	private $mailers;
+	private array $mailers;
 
-	/** @var int */
-	private $retryCount;
+	private int $retryCount;
 
-	/** @var int in miliseconds */
-	private $retryWaitTime;
+	/** in miliseconds */
+	private int $retryWaitTime;
 
 
 	/**
 	 * @param Mailer[]  $mailers
-	 * @param int  $retryWaitTime in miliseconds
 	 */
 	public function __construct(array $mailers, int $retryCount = 3, int $retryWaitTime = 1000)
 	{
@@ -64,7 +62,7 @@ public function send(Message $mail): void
 
 				} catch (SendException $e) {
 					$failures[] = $e;
-					$this->onFailure($this, $e, $mailer, $mail);
+					Nette\Utils\Arrays::invoke($this->onFailure, $this, $e, $mailer, $mail);
 				}
 			}
 		}
@@ -75,8 +73,7 @@ public function send(Message $mail): void
 	}
 
 
-	/** @return static */
-	public function addMailer(Mailer $mailer)
+	public function addMailer(Mailer $mailer): static
 	{
 		$this->mailers[] = $mailer;
 		return $this;