From 19e78bf19681e88fcbe6b60e655953e3b44b14e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Mat=C4=9Bj=C4=8Dek?= <milan.matejcek@gmail.com>
Date: Mon, 7 Aug 2023 07:08:09 +0200
Subject: [PATCH] Annotations and constructors

---
 src/Mailer/CompositeMailer.php |  9 +++------
 src/Mailer/DevOpsMailer.php    | 13 ++-----------
 src/Mailer/SendmailMailer.php  |  3 ---
 src/Mailer/TraceableMailer.php | 12 +++---------
 src/Message/Message.php        |  2 +-
 5 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/Mailer/CompositeMailer.php b/src/Mailer/CompositeMailer.php
index 847f938..6dca394 100644
--- a/src/Mailer/CompositeMailer.php
+++ b/src/Mailer/CompositeMailer.php
@@ -9,14 +9,11 @@
 class CompositeMailer implements Mailer
 {
 
-	/** @var Mailer[] */
+	/** @var array<Mailer> */
 	private array $mailers = [];
 
-	private bool $silent;
-
-	public function __construct(bool $silent = false)
+	public function __construct(private bool $silent = false)
 	{
-		$this->silent = $silent;
 	}
 
 	public function add(Mailer $mailer): void
@@ -25,7 +22,7 @@ public function add(Mailer $mailer): void
 	}
 
 	/**
-	 * @throw Exception
+	 * @throws Throwable
 	 */
 	public function send(Message $mail): void
 	{
diff --git a/src/Mailer/DevOpsMailer.php b/src/Mailer/DevOpsMailer.php
index cc0600d..638923c 100644
--- a/src/Mailer/DevOpsMailer.php
+++ b/src/Mailer/DevOpsMailer.php
@@ -8,22 +8,13 @@
 class DevOpsMailer implements Mailer
 {
 
-	private Mailer $mailer;
-
-	private string $mail;
-
-	public function __construct(Mailer $mailer, string $mail)
+	public function __construct(private Mailer $mailer, private string $mail)
 	{
-		$this->mailer = $mailer;
-		$this->mail = $mail;
 	}
 
-	/**
-	 * Sends email
-	 */
 	public function send(Message $mail): void
 	{
-		/** @var callable(string): string[] $getHeaders */
+		/** @var callable(string): array<string> $getHeaders */
 		$getHeaders = static fn (string $name) => (array) $mail->getHeader($name);
 
 		// Set original To, Cc, Bcc
diff --git a/src/Mailer/SendmailMailer.php b/src/Mailer/SendmailMailer.php
index b467690..68a1e69 100644
--- a/src/Mailer/SendmailMailer.php
+++ b/src/Mailer/SendmailMailer.php
@@ -24,9 +24,6 @@ public function setBounceMail(string $bounceMail): void
 		$this->bounceMail = $bounceMail;
 	}
 
-	/**
-	 * Sends email
-	 */
 	public function send(Message $mail): void
 	{
 		if ($this->bounceMail !== null) {
diff --git a/src/Mailer/TraceableMailer.php b/src/Mailer/TraceableMailer.php
index 78de4d0..0ebdac7 100644
--- a/src/Mailer/TraceableMailer.php
+++ b/src/Mailer/TraceableMailer.php
@@ -8,19 +8,13 @@
 class TraceableMailer implements Mailer
 {
 
-	private Mailer $mailer;
-
-	/** @var Message[] */
+	/** @var array<Message> */
 	private array $mails = [];
 
-	public function __construct(Mailer $mailer)
+	public function __construct(private Mailer $mailer)
 	{
-		$this->mailer = $mailer;
 	}
 
-	/**
-	 * Sends email
-	 */
 	public function send(Message $mail): void
 	{
 		// Trace sent mails
@@ -31,7 +25,7 @@ public function send(Message $mail): void
 	}
 
 	/**
-	 * @return Message[]
+	 * @return array<Message>
 	 */
 	public function getMails(): array
 	{
diff --git a/src/Message/Message.php b/src/Message/Message.php
index 6472ab7..0c801d4 100644
--- a/src/Message/Message.php
+++ b/src/Message/Message.php
@@ -8,7 +8,7 @@ class Message extends NMessage
 {
 
 	/**
-	 * @param string[] $receivers
+	 * @param array<string, string|null> $receivers
 	 */
 	public function addTos(array $receivers): void
 	{