Browse Source

Add defaults for from

mscherer 5 years ago
parent
commit
648c8b54bf
2 changed files with 6 additions and 11 deletions
  1. 1 0
      src/Mailer/Mailer.php
  2. 5 11
      src/Mailer/Message.php

+ 1 - 0
src/Mailer/Mailer.php

@@ -20,6 +20,7 @@ class Mailer extends CakeMailer {
 	 * Message class name.
 	 *
 	 * @var string
+	 * @psalm-var class-string<\Cake\Mailer\Message>
 	 */
 	protected $messageClass = Message::class;
 

+ 5 - 11
src/Mailer/Message.php

@@ -29,20 +29,16 @@ class Message extends CakeMessage {
 		if ($xMailer) {
 			$this->addHeaders(['X-Mailer' => $xMailer]);
 		}
+
+		$this->setDefaults();
 	}
 
 	/**
 	 * Overwrite to allow custom enhancements
 	 *
-	 * @param array|string $config
-	 * @return $this
+	 * @return void
 	 */
-	public function _setProfile($config) {
-		if (!is_array($config)) {
-			$config = (string)$config;
-		}
-		//$this->_applyConfig($config);
-
+	protected function setDefaults(): void {
 		$fromEmail = Configure::read('Config.systemEmail');
 		if ($fromEmail) {
 			$fromName = Configure::read('Config.systemName');
@@ -51,10 +47,8 @@ class Message extends CakeMessage {
 			$fromName = Configure::read('Config.adminName');
 		}
 		if ($fromEmail) {
-			//$this->setFrom($fromEmail, $fromName);
+			$this->setFrom($fromEmail, $fromName);
 		}
-
-		return $this;
 	}
 
 	/**