cs

Author: dg

tests/Mail/FallbackMailer.phpt

@@ -49,9 +49,11 @@ test('', function () {
 		$onFailureCalls[] = $mailer;
 	};
 
-	$e = Assert::exception(function () use ($mailer) {
-		$mailer->send(new Message);
-	}, FallbackMailerException::class, 'All mailers failed to send the message.');
+	$e = Assert::exception(
+		fn() => $mailer->send(new Message),
+		FallbackMailerException::class,
+		'All mailers failed to send the message.',
+	);
 	Assert::same([$subMailerA, $subMailerB, $subMailerA, $subMailerB, $subMailerA, $subMailerB], $onFailureCalls);
 	Assert::count(6, $e->failures);
 	Assert::same('Failure #1', $e->failures[0]->getMessage());

tests/Mail/Mail.dkim.invalidKey.phpt

@@ -26,6 +26,7 @@ $mail->addTo('Lady Jane <[email protected]>');
 $mail->setSubject('Hello Jane!');
 $mail->setBody('Příliš žluťoučký kůň');
 
-Assert::exception(function () use ($signer, $mail) {
-	$signer->generateSignedMessage($mail);
-}, SignException::class);
+Assert::exception(
+	fn() => $signer->generateSignedMessage($mail),
+	SignException::class,
+);

tests/Mail/Mail.email.errors.phpt

@@ -15,51 +15,64 @@ require __DIR__ . '/../bootstrap.php';
 
 $mail = new Message;
 
-Assert::exception(function () use ($mail) {
-	// From
-	$mail->setFrom('John Doe <doe@example. com>');
-}, Nette\Utils\AssertionException::class, "The header 'From' expects to be email, string 'doe@example. com' given.");
+Assert::exception(
+	fn() => $mail->setFrom('John Doe <doe@example. com>'),
+	Nette\Utils\AssertionException::class,
+	"The header 'From' expects to be email, string 'doe@example. com' given.",
+);
 
 
-Assert::exception(function () use ($mail) {
-	$mail->setFrom('John Doe <>');
-}, Nette\Utils\AssertionException::class, "The header 'From' expects to be email, string '' given.");
+Assert::exception(
+	fn() => $mail->setFrom('John Doe <>'),
+	Nette\Utils\AssertionException::class,
+	"The header 'From' expects to be email, string '' given.",
+);
 
 
-Assert::exception(function () use ($mail) {
-	$mail->setFrom('John Doe <doe@examplecom>');
-}, Nette\Utils\AssertionException::class, "The header 'From' expects to be email, string 'doe@examplecom' given.");
+Assert::exception(
+	fn() => $mail->setFrom('John Doe <doe@examplecom>'),
+	Nette\Utils\AssertionException::class,
+	"The header 'From' expects to be email, string 'doe@examplecom' given.",
+);
 
 
-Assert::exception(function () use ($mail) {
-	$mail->setFrom('John Doe');
-}, Nette\Utils\AssertionException::class, "The header 'From' expects to be email, string 'John Doe' given.");
+Assert::exception(
+	fn() => $mail->setFrom('John Doe'),
+	Nette\Utils\AssertionException::class,
+	"The header 'From' expects to be email, string 'John Doe' given.",
+);
 
 
-Assert::exception(function () use ($mail) {
-	$mail->setFrom('doe;@examplecom');
-}, Nette\Utils\AssertionException::class, "The header 'From' expects to be email, string 'doe;@examplecom' given.");
+Assert::exception(
+	fn() => $mail->setFrom('doe;@examplecom'),
+	Nette\Utils\AssertionException::class,
+	"The header 'From' expects to be email, string 'doe;@examplecom' given.",
+);
 
 
-Assert::exception(function () use ($mail) {
-	// addReplyTo
-	$mail->addReplyTo('@');
-}, Nette\Utils\AssertionException::class, "The header 'Reply-To' expects to be email, string '@' given.");
+Assert::exception(
+	fn() => $mail->addReplyTo('@'),
+	Nette\Utils\AssertionException::class,
+	"The header 'Reply-To' expects to be email, string '@' given.",
+);
 
 
-Assert::exception(function () use ($mail) {
-	// addTo
-	$mail->addTo('@');
-}, Nette\Utils\AssertionException::class, "The header 'To' expects to be email, string '@' given.");
+Assert::exception(
+	fn() => $mail->addTo('@'),
+	Nette\Utils\AssertionException::class,
+	"The header 'To' expects to be email, string '@' given.",
+);
 
 
-Assert::exception(function () use ($mail) {
-	// addCc
-	$mail->addCc('@');
-}, Nette\Utils\AssertionException::class, "The header 'Cc' expects to be email, string '@' given.");
+Assert::exception(
+	fn() => $mail->addCc('@'),
+	Nette\Utils\AssertionException::class,
+	"The header 'Cc' expects to be email, string '@' given.",
+);
 
 
-Assert::exception(function () use ($mail) {
-	// addBcc
-	$mail->addBcc('@');
-}, Nette\Utils\AssertionException::class, "The header 'Bcc' expects to be email, string '@' given.");
+Assert::exception(
+	fn() => $mail->addBcc('@'),
+	Nette\Utils\AssertionException::class,
+	"The header 'Bcc' expects to be email, string '@' given.",
+);

tests/Mail/Mail.headers.001.phpt

@@ -17,14 +17,20 @@ require __DIR__ . '/Mail.php';
 
 $mail = new Message;
 
-Assert::exception(function () use ($mail) {
-	$mail->setHeader('', 'value');
-}, InvalidArgumentException::class, "Header name must be non-empty alphanumeric string, '' given.");
-
-Assert::exception(function () use ($mail) {
-	$mail->setHeader(' name', 'value');
-}, InvalidArgumentException::class, "Header name must be non-empty alphanumeric string, ' name' given.");
-
-Assert::exception(function () use ($mail) {
-	$mail->setHeader('n*ame', 'value');
-}, InvalidArgumentException::class, "Header name must be non-empty alphanumeric string, 'n*ame' given.");
+Assert::exception(
+	fn() => $mail->setHeader('', 'value'),
+	InvalidArgumentException::class,
+	"Header name must be non-empty alphanumeric string, '' given.",
+);
+
+Assert::exception(
+	fn() => $mail->setHeader(' name', 'value'),
+	InvalidArgumentException::class,
+	"Header name must be non-empty alphanumeric string, ' name' given.",
+);
+
+Assert::exception(
+	fn() => $mail->setHeader('n*ame', 'value'),
+	InvalidArgumentException::class,
+	"Header name must be non-empty alphanumeric string, 'n*ame' given.",
+);