Issue #3275310 by AdamPS: Improvements to phases and processors (f4eb87d8) · Commits · project / symfony_mailer

modules/symfony_mailer_bc/src/MailManagerReplacement.php

+5 −2

Changes for modules/symfony_mailer_bc/src/MailManagerReplacement.php: 5 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -123,9 +123,12 @@ class MailManagerReplacement extends MailManager {
		*/
		public function emailFromArray(EmailInterface $email, array $message, array $original = []) {
		$email->setLangcode($message['langcode'])
		->setParams($message['params'])
		->setSubject($message['subject']);

		if ($email->getPhase() == EmailInterface::PHASE_INIT) {
		$email->setParams($message['params']);
		}

		// Address headers.
		$headers = $email->getHeaders();
		foreach (self::HEADERS as $name => $key) {
		@@ -183,7 +186,7 @@ class MailManagerReplacement extends MailManager {
		'params' => $email->getParams(),
		'send' => TRUE,
		'subject' => $email->getSubject(),
		'body' => $email->isRendered() ? $email->getHtmlBody() : $email->getBody(),
		'body' => ($email->getPhase() >= EmailInterface::PHASE_POST_RENDER) ? $email->getHtmlBody() : $email->getBody(),
		];

		// Address headers.

+1 −1

Changes for modules/symfony_mailer_bc/src/Plugin/EmailBuilder/CommerceEmailBuilder.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ class CommerceEmailBuilder extends EmailProcessorBase {
		/**
		* {@inheritdoc}
		*/
		public function preRender(EmailInterface $email) {
		public function build(EmailInterface $email) {
		$email->setSubject($email->getParam('subject'))
		->setBody($email->getParam('body'));

+2 −2

Changes for modules/symfony_mailer_bc/src/Plugin/EmailBuilder/ContactEmailBuilder.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@ class ContactEmailBuilder extends ContactEmailBuilderBase {
		/**
		* {@inheritdoc}
		*/
		public function preRender(EmailInterface $email) {
		parent::preRender($email);
		public function build(EmailInterface $email) {
		parent::build($email);
		$recipient = $email->getParams()['recipient'];

		$email->setVariable('recipient_name', $recipient->getDisplayName())

+1 −1

Changes for modules/symfony_mailer_bc/src/Plugin/EmailBuilder/ContactEmailBuilderBase.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ class ContactEmailBuilderBase extends EmailProcessorBase {
		/**
		* {@inheritdoc}
		*/
		public function preRender(EmailInterface $email) {
		public function build(EmailInterface $email) {
		/** @var \Drupal\user\UserInterface $sender */
		$sender = $email->getParam('sender');
		$contact_message = $email->getParam('contact_message');

+2 −2

Changes for modules/symfony_mailer_bc/src/Plugin/EmailBuilder/ContactPageEmailBuilder.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ class ContactPageEmailBuilder extends ContactEmailBuilderBase implements MailerP
		/**
		* {@inheritdoc}
		*/
		public function preRender(EmailInterface $email) {
		parent::preRender($email);
		public function build(EmailInterface $email) {
		parent::build($email);
		$email->setVariable('form', $email->getEntity()->label())
		->setVariable('form_url', Url::fromRoute('<current>')->toString());