https://github.com/opencart/opencart/issues/14029

rahulabs · Jul 3, 2024 · 1ba8c61 · 1ba8c61
1 parent e2dd16a
commit 1ba8c61
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/upload/system/library/mail.php b/upload/system/library/mail.php
@@ -13,7 +13,7 @@
  * Class Mail
  */
 class Mail {
-	private string $adaptor;
+	private string $class;
 	/**
 	 * @var array<string, mixed>
 	 */
@@ -29,7 +29,7 @@ public function __construct(string $adaptor = 'mail', array $option = []) {
 		$class = 'Opencart\System\Library\Mail\\' . $adaptor;
 
 		if (class_exists($class)) {
-			$this->adaptor = $adaptor;
+			$this->class = $class;
 			$this->option = $option;
 		} else {
 			throw new \Exception('Error: Could not load mail adaptor ' . $adaptor . '!');
@@ -150,7 +150,7 @@ public function send(): bool {
 			throw new \Exception('Error: E-Mail message required!');
 		}
 
-		$mail = new $this->adaptor($this->option);
+		$mail = new $this->class($this->option);
 
 		return $mail->send();
 	}

diff --git a/upload/system/library/mail/mail.php b/upload/system/library/mail/mail.php
@@ -16,8 +16,8 @@ class Mail {
 	 *
 	 * @param array<string, mixed> $option
 	 */
-	public function __construct(array &$option = []) {
-		$this->option = &$option;
+	public function __construct(array $option = []) {
+		$this->option = $option;
 	}
 
 	/**

diff --git a/upload/system/library/mail/smtp.php b/upload/system/library/mail/smtp.php
@@ -26,14 +26,14 @@ class Smtp {
 	 *
 	 * @param array<string, mixed> $option
 	 */
-	public function __construct(array &$option = []) {
+	public function __construct(array $option = []) {
 		foreach ($this->default as $key => $value) {
 			if (!isset($option[$key])) {
 				$option[$key] = $value;
 			}
 		}
 
-		$this->option = &$option;
+		$this->option = $option;
 	}
 
 	/**