Merge pull request #8451 from jdarwood007/mailAgentFixes

Various fixes for Mail Agent

Author: Sesquipedalian

Sources/MailAgent/APIs/SMTP.php

@@ -18,8 +18,8 @@
 use SMF\Lang;
 use SMF\MailAgent\MailAgent;
 use SMF\MailAgent\MailAgentInterface;
+use SMF\Sapi;
 use SMF\Url;
-use SMF\Utils;
 
 /**
  * Sends mail via SMTP
@@ -41,11 +41,12 @@ class SMTP extends MailAgent implements MailAgentInterface
 	public bool $useTLS = false;
 
 	/**
-	 * @var resource
+	 * @var resource|false
 	 *
 	 * A file pointer containing the active connection to the SMTP server.
+	 * PHP does not have a type hint for resource of type Stream.  So we just use mixed.
 	 */
-	private object $socket;
+	private mixed $socket;
 
 	/**
 	 * {@inheritDoc}
@@ -111,16 +112,9 @@ public function connect(): bool
 						return false;
 					}
 
-					// Enable the encryption
-					// php 5.6+ fix
-					$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+					$crypto_method = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
 
-					if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
-						$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-						$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
-					}
-
-					if (!@stream_socket_enable_crypto($this->socket, true, $crypto_method)) {
+					if (!stream_socket_enable_crypto($this->socket, true, $crypto_method)) {
 						return false;
 					}
 
@@ -198,8 +192,8 @@ public function send(string $to, string $subject, string $message, string $heade
 		}
 
 		// Almost done, almost done... don't stop me just yet!
-		Utils::sapiSetTimeLimit(300);
-		Utils::sapiResetTimeout();
+		Sapi::setTimeLimit(300);
+		Sapi::resetTimeout();
 
 		return true;
 	}

Sources/MailAgent/APIs/SendMail.php

@@ -18,7 +18,7 @@
 use SMF\Lang;
 use SMF\MailAgent\MailAgent;
 use SMF\MailAgent\MailAgentInterface;
-use SMF\Utils;
+use SMF\Sapi;
 
 /**
  * Sends mail via SendMail
@@ -89,8 +89,8 @@ function ($errno, $errstr, $errfile, $errline) {
 		restore_error_handler();
 
 		// Wait, wait, I'm still sending here!
-		Utils::sapiSetTimeLimit();
-		Utils::sapiResetTimeout();
+		Sapi::setTimeLimit();
+		Sapi::resetTimeout();
 
 		return $mail_result;
 	}

Sources/MailAgent/MailAgent.php

@@ -54,11 +54,11 @@ abstract class MailAgent
 	public static string $agent;
 
 	/**
-	 * @var \SMF\MailAgent\MailAgentInterface|bool
+	 * @var \SMF\MailAgent\MailAgentInterface|bool|null
 	 *
 	 * The loaded agent, or false on failure.
 	 */
-	public static MailAgentInterface|bool $loaded_api;
+	public static MailAgentInterface|bool|null $loaded_api = null;
 
 	/**********************
 	 * Protected properties
@@ -211,7 +211,7 @@ final public static function load(bool $loadDefault = false): bool|MailAgentInte
 			}
 		}
 
-		if (is_object(self::$loaded_api)) {
+		if (!is_null(self::$loaded_api) && is_object(self::$loaded_api)) {
 			return self::$loaded_api;
 		}
 
@@ -220,7 +220,7 @@ final public static function load(bool $loadDefault = false): bool|MailAgentInte
 		}
 
 		// What agent we are going to try.
-		$agent_class_name = !empty(self::$agent) ? self::$agent : self::APIS_DEFAULT;
+		$agent_class_name = !empty(self::$agent) && !$loadDefault ? self::$agent : self::APIS_DEFAULT;
 		$fully_qualified_class_name = self::APIS_NAMESPACE . $agent_class_name;
 
 		// Do some basic tests.
@@ -252,10 +252,6 @@ final public static function load(bool $loadDefault = false): bool|MailAgentInte
 			}
 		}
 
-		if (!$agent_api && $agent_class_name !== self::APIS_DEFAULT) {
-			$agent_api = self::load(false);
-		}
-
 		return $agent_api;
 	}