Issue #3030231 by ToxaViking, bohart: Remove usages of @deprecated drupal_set_message() (5f0d58a0) · Commits · project / reroute_email

reroute_email.module

+2 −2

Original line number	Diff line number	Diff line
		@@ -163,12 +163,12 @@ function reroute_email_mail_alter(&$message) {
		]);

		// Let users know email has been aborted, but logged.
		drupal_set_message(t('<em>@message_id</em> was aborted by reroute email; site administrators can check the recent log entries for complete details on the rerouted email.', ['@message_id' => $message['id']]));
		\Drupal::messenger()->addMessage(t('<em>@message_id</em> was aborted by reroute email; site administrators can check the recent log entries for complete details on the rerouted email.', ['@message_id' => $message['id']]));
		}
		elseif ($config->get(REROUTE_EMAIL_MESSAGE)) {

		// Display a message to let users know email was rerouted.
		drupal_set_message(t('Submitted email, with ID: <em>@message_id</em>, was rerouted to configured address: <em>@reroute_target</em>. For more details please refer to Reroute Email settings.', [
		\Drupal::messenger()->addMessage(t('Submitted email, with ID: <em>@message_id</em>, was rerouted to configured address: <em>@reroute_target</em>. For more details please refer to Reroute Email settings.', [
		'@message_id' => $message['id'],
		'@reroute_target' => $message['to'],
		]));

src/Form/TestEmailForm.php

+13 −3

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ use Drupal\Core\Form\FormBase;
		use Drupal\Core\Form\FormStateInterface;
		use Drupal\Core\Language\LanguageManagerInterface;
		use Drupal\Core\Mail\MailManagerInterface;
		use Drupal\Core\Messenger\MessengerInterface;
		use Symfony\Component\DependencyInjection\ContainerInterface;

		/**
		@@ -34,13 +35,21 @@ class TestEmailForm extends FormBase {
		return 'reroute_email_test_email_form';
		}

		/**
		* The messenger.
		*
		* @var \Drupal\Core\Messenger\MessengerInterface
		*/
		protected $messenger;

		/**
		* {@inheritdoc}
		*/
		public static function create(ContainerInterface $container) {
		return new static(
		$container->get('plugin.manager.mail'),
		$container->get('language_manager')
		$container->get('language_manager'),
		$container->get('messenger')
		);
		}

		@@ -52,9 +61,10 @@ class TestEmailForm extends FormBase {
		* @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
		* The language manager.
		*/
		public function __construct(MailManagerInterface $mail_manager, LanguageManagerInterface $language_manager) {
		public function __construct(MailManagerInterface $mail_manager, LanguageManagerInterface $language_manager, MessengerInterface $messenger) {
		$this->mailManager = $mail_manager;
		$this->languageManager = $language_manager;
		$this->messenger = $messenger;
		}

		/**
		@@ -109,7 +119,7 @@ class TestEmailForm extends FormBase {
		$message = $this->mailManager->mail('reroute_email', 'test_email_form', $to, $langcode, $params);

		if (!empty($message['result'])) {
		drupal_set_message($this->t('Test email submitted for delivery from test form.'));
		$this->messenger->addMessage($this->t('Test email submitted for delivery from test form.'));
		}
		}