Further Drupal 8.6.4 changes. Some core files were not committed before a commit...

[yaffs-website] / web / core / modules / system / src / Form / ModulesListConfirmForm.php

diff --git a/web/core/modules/system/src/Form/ModulesListConfirmForm.php b/web/core/modules/system/src/Form/ModulesListConfirmForm.php
index 50026606d2921022a0f5732de0f6a43232e7469e..834b436345b9e85a0ec590ab5becea91ba3bf73c 100644 (file)
--- a/web/core/modules/system/src/Form/ModulesListConfirmForm.php
+++ b/web/core/modules/system/src/Form/ModulesListConfirmForm.php
@@ -14,6 +14,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Builds a confirmation form for enabling modules with dependencies.
+ *
+ * @internal
  */
 class ModulesListConfirmForm extends ConfirmFormBase {
 
@@ -172,29 +174,27 @@ class ModulesListConfirmForm extends ConfirmFormBase {
       }
       catch (PreExistingConfigException $e) {
         $config_objects = $e->flattenConfigObjects($e->getConfigObjects());
-        drupal_set_message(
+        $this->messenger()->addError(
           $this->formatPlural(
             count($config_objects),
             'Unable to install @extension, %config_names already exists in active configuration.',
             'Unable to install @extension, %config_names already exist in active configuration.',
             [
               '%config_names' => implode(', ', $config_objects),
-              '@extension' => $this->modules['install'][$e->getExtension()]
-            ]),
-          'error'
+              '@extension' => $this->modules['install'][$e->getExtension()],
+            ])
         );
         return;
       }
       catch (UnmetDependenciesException $e) {
-        drupal_set_message(
-          $e->getTranslatedMessage($this->getStringTranslation(), $this->modules['install'][$e->getExtension()]),
-          'error'
+        $this->messenger()->addError(
+          $e->getTranslatedMessage($this->getStringTranslation(), $this->modules['install'][$e->getExtension()])
         );
         return;
       }
 
       $module_names = array_values($this->modules['install']);
-      drupal_set_message($this->formatPlural(count($module_names), 'Module %name has been enabled.', '@count modules have been enabled: %names.', [
+      $this->messenger()->addStatus($this->formatPlural(count($module_names), 'Module %name has been enabled.', '@count modules have been enabled: %names.', [
         '%name' => $module_names[0],
         '%names' => implode(', ', $module_names),
       ]));