diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 11d2c400d6..8499f20673 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -2356,9 +2356,10 @@ function install_config_import_batch() { catch (ConfigImporterException $e) { global $install_state; // There are validation errors. - drupal_set_message(t('The configuration synchronization failed validation.'), 'error'); + $messenger = \Drupal::messenger(); + $messenger->addError(t('The configuration synchronization failed validation.')); foreach ($config_importer->getErrors() as $message) { - drupal_set_message($message, 'error'); + $messenger->addError($message); } install_display_output(['#title' => t('Configuration validation')], $install_state); } @@ -2397,13 +2398,15 @@ function install_config_import_batch_process(ConfigImporter $config_importer, $s * @see install_config_import_batch() */ function install_config_import_batch_finish($success, $results, $operations) { + $messenger = \Drupal::messenger(); if ($success) { if (!empty($results['errors'])) { + $logger = \Drupal::logger('config_sync'); foreach ($results['errors'] as $error) { - drupal_set_message($error, 'error'); - \Drupal::logger('config_sync')->error($error); + $messenger->addError($error); + $logger->error($error); } - drupal_set_message(t('The configuration was imported with errors.'), 'warning'); + $messenger->addWarning(t('The configuration was imported with errors.')); } else { // Configuration sync needs a complete cache flush. @@ -2418,7 +2421,7 @@ function install_config_import_batch_finish($success, $results, $operations) { '%error_operation' => $error_operation[0], '@arguments' => print_r($error_operation[1], TRUE) ]); - drupal_set_message($message, 'error'); + $messenger->addError($message); } } @@ -2468,10 +2471,11 @@ function install_config_fix_profile() { } catch (ConfigImporterException $e) { global $install_state; + $messenger = \Drupal::messenger(); // There are validation errors. - drupal_set_message(t('The configuration synchronization failed validation.'), 'error'); + $messenger->addError(t('The configuration synchronization failed validation.')); foreach ($config_importer->getErrors() as $message) { - drupal_set_message($message, 'error'); + $messenger->addError($message); } install_display_output(['#title' => t('Configuration validation')], $install_state); }