Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / inline_form_errors / src / FormErrorHandler.php

diff --git a/web/core/modules/inline_form_errors/src/FormErrorHandler.php b/web/core/modules/inline_form_errors/src/FormErrorHandler.php
index 2bcbfc60be7f2fc37611f6e425fbebc70e221231..fda5fa136a2db97744276835d64155006f3382d2 100644 (file)
--- a/web/core/modules/inline_form_errors/src/FormErrorHandler.php
+++ b/web/core/modules/inline_form_errors/src/FormErrorHandler.php
@@ -5,6 +5,7 @@ namespace Drupal\inline_form_errors;
 use Drupal\Core\Form\FormElementHelper;
 use Drupal\Core\Form\FormErrorHandler as CoreFormErrorHandler;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\LinkGeneratorTrait;
 use Drupal\Core\Render\RendererInterface;
@@ -28,6 +29,13 @@ class FormErrorHandler extends CoreFormErrorHandler {
    */
   protected $renderer;
 
+  /**
+   * The messenger.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a new FormErrorHandler.
    *
@@ -37,11 +45,14 @@ class FormErrorHandler extends CoreFormErrorHandler {
    *   The link generation service.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
-  public function __construct(TranslationInterface $string_translation, LinkGeneratorInterface $link_generator, RendererInterface $renderer) {
+  public function __construct(TranslationInterface $string_translation, LinkGeneratorInterface $link_generator, RendererInterface $renderer, MessengerInterface $messenger) {
     $this->stringTranslation = $string_translation;
     $this->linkGenerator = $link_generator;
     $this->renderer = $renderer;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -96,7 +107,7 @@ class FormErrorHandler extends CoreFormErrorHandler {
 
     // Set normal error messages for all remaining errors.
     foreach ($errors as $error) {
-      $this->drupalSetMessage($error, 'error');
+      $this->messenger->addError($error);
     }
 
     if (!empty($error_links)) {
@@ -111,7 +122,7 @@ class FormErrorHandler extends CoreFormErrorHandler {
         ],
       ];
       $message = $this->renderer->renderPlain($render_array);
-      $this->drupalSetMessage($message, 'error');
+      $this->messenger->addError($message);
     }
   }