From 91c325174f44308c6ba46c80e9cdd065a022243f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 6 Apr 2025 14:20:04 +0200
Subject: [PATCH] [ticket/17490] Add type hints to enforce some types

PHPBB-17490
---
 phpBB/phpbb/messenger/method/email.php | 21 +++++++++++----------
 tests/messenger/method_email_test.php  |  2 --
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php
index 9e972fa855..6fb3e20e68 100644
--- a/phpBB/phpbb/messenger/method/email.php
+++ b/phpBB/phpbb/messenger/method/email.php
@@ -15,6 +15,7 @@ namespace phpbb\messenger\method;
 
 use Symfony\Component\Mailer\Transport;
 use Symfony\Component\Mailer\Mailer;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email as symfony_email;
@@ -39,16 +40,16 @@ class email extends base
 	 *
 	 * Symfony Mailer transport DSN
 	 */
-	protected $dsn = '';
+	protected string $dsn = '';
 
 	/** @var symfony_email */
-	protected $email;
+	protected symfony_email $email;
 
 	/** @var Address From address */
-	protected $from;
+	protected Address $from;
 
 	/** @var Headers Email headers */
-	protected $headers;
+	protected Headers $headers;
 
 	/**
 	 * @var int
@@ -60,16 +61,16 @@ class email extends base
 	 * symfony_email::PRIORITY_LOW
 	 * symfony_email::PRIORITY_LOWEST
 	 */
-	protected $mail_priority = symfony_email::PRIORITY_NORMAL;
+	protected int $mail_priority = symfony_email::PRIORITY_NORMAL;
 
 	/** @var \phpbb\messenger\queue */
 	protected $queue;
 
 	/** @var Address */
-	protected $reply_to;
+	protected Address $reply_to;
 
-	/** @var \Symfony\Component\Mailer\Transport\AbstractTransport */
-	protected $transport;
+	/** @var AbstractTransport */
+	protected AbstractTransport $transport;
 
 	/**
 	 * {@inheritDoc}
@@ -454,9 +455,9 @@ class email extends base
 	/**
 	 * Get mailer transport object
 	 *
-	 * @return ?TransportInterface Symfony Mailer transport object
+	 * @return TransportInterface Symfony Mailer transport object
 	 */
-	public function get_transport(): ?TransportInterface
+	public function get_transport(): TransportInterface
 	{
 		return $this->transport;
 	}
diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php
index a053658378..a1d8256070 100644
--- a/tests/messenger/method_email_test.php
+++ b/tests/messenger/method_email_test.php
@@ -139,7 +139,6 @@ class phpbb_messenger_method_email_test extends \phpbb_test_case
 
 	public function test_set_transport()
 	{
-		$this->assertNull($this->method_email->get_transport());
 		$this->assertEmpty($this->method_email->get_dsn());
 
 		$config_values = [
@@ -179,7 +178,6 @@ class phpbb_messenger_method_email_test extends \phpbb_test_case
 		$this->config->set('email_package_size', 100);
 		$email_reflection = new \ReflectionClass($this->method_email);
 		$email_property = $email_reflection->getProperty('email');
-		$this->assertNull($email_property->getValue($this->method_email));
 
 		$use_queue_property = $email_reflection->getProperty('use_queue');
 		$this->assertFalse($use_queue_property->getValue($this->method_email));