From 08bc097dd45d651cd102f4717e57f1c98be0268d Mon Sep 17 00:00:00 2001
From: the-djmaze <3752035+the-djmaze@users.noreply.github.com>
Date: Tue, 27 Oct 2026 16:24:54 +0100
Subject: [PATCH] PHP 8.4 Implicitly marking parameter $... as nullable is
 deprecated

---
 snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php  |  7 +------
 snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php  |  2 +-
 .../v/0.0.0/app/libraries/snappymail/http/request.php  | 10 +++++-----
 .../app/libraries/snappymail/smime/certificate.php     |  4 +++-
 snappymail/v/0.0.0/app/libraries/snappymail/tar.php    |  5 +----
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
index 67bb61489..b4d79017f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
@@ -30,12 +30,7 @@ class Http
 		return $oInstance;
 	}
 
-	/**
-	 * @param mixed $mDefault = null
-	 *
-	 * @return mixed
-	 */
-	public static function GetServer(string $sKey, $mDefault = null)
+	public static function GetServer(string $sKey, mixed $mDefault = null): mixed
 	{
 		return isset($_SERVER[$sKey]) ? $_SERVER[$sKey] : $mDefault;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 1eae20e14..998994264 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -963,7 +963,7 @@ class Actions
 	 *
 	 * @return mixed
 	 */
-	public function GetActionParam(string $sKey, $mDefault = null)
+	public function GetActionParam(string $sKey, ?mixed $mDefault = null)
 	{
 		return isset($this->aCurrentActionParams[$sKey]) ?
 			$this->aCurrentActionParams[$sKey] : $mDefault;
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
index 8c1c3604a..04d9dd63a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
@@ -76,7 +76,7 @@ abstract class Request
 		$this->stream = $stream;
 	}
 
-	public function setCABundleFile($file)
+	public function setCABundleFile(?string $file)
 	{
 		$this->ca_bundle = $file;
 	}
@@ -87,7 +87,7 @@ abstract class Request
 	 *
 	 * @return bool
 	 */
-	public function canFetchURI($uri)
+	public function canFetchURI(string $uri)
 	{
 		if ('https:' === \substr($uri, 0, 6) && !$this->supportsSSL()) {
 			\trigger_error('HTTPS URI unsupported fetching '.$uri, E_USER_WARNING);
@@ -111,7 +111,7 @@ abstract class Request
 
 	abstract protected function __doRequest(string &$method, string &$request_url, &$body, array $extra_headers) : Response;
 
-	public function doRequest($method, $request_url, /*string|array*/$body = null, array $extra_headers = array()) : ?Response
+	public function doRequest(string $method, string $request_url, string|array|null $body = null, array $extra_headers = array()) : ?Response
 	{
 		$method = \strtoupper($method);
 		$url    = $request_url;
@@ -157,12 +157,12 @@ abstract class Request
 	 * Return whether a URI should be allowed. Override this method to conform to your local policy.
 	 * By default, will attempt to fetch any http or https URI.
 	 */
-	public static function URIHasAllowedScheme($uri) : bool
+	public static function URIHasAllowedScheme(string $uri) : bool
 	{
 		return (bool) \preg_match('#^https?://#i', $uri);
 	}
 
-	public static function getSchemePort($scheme) : int
+	public static function getSchemePort(string $scheme) : int
 	{
 		return self::$scheme_ports[$scheme] ?? 0;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php b/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php
index 2a12ba905..d00092406 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php
@@ -34,7 +34,9 @@ class Certificate
 	 * A string having the format file://path/to/cert.pem; the named file must contain a PEM encoded certificate
 	 * A string containing the content of a certificate, PEM encoded, may start with -----BEGIN CERTIFICATE-----
 	 */
-	function __construct($x509cert = null, $privateKey = null)
+	function __construct(\OpenSSLCertificate|string $x509cert = null,
+		#[\SensitiveParameter]
+		\OpenSSLAsymmetricKey|\OpenSSLCertificate|array|string $privateKey = null)
 	{
 		if ($x509cert) {
 			$x509cert = \openssl_x509_read($x509cert);
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/tar.php b/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
index e36c165e1..80ae166a1 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
@@ -18,10 +18,7 @@ class TAR
 		$this->alias = $alias ?: $filename;
 	}
 
-	/**
-	 * @param $files array|string|null
-	 */
-	public function extractTo(string $directory, $files = null, bool $overwrite = false) : bool
+	public function extractTo(string $directory, array|string|null $files = null, bool $overwrite = false) : bool
 	{
 		$fp = \gzopen($this->filename, 'rb');
 		if (!$fp) {