' . t('Import configuration that is placed in your staging directory. All changes, deletions, renames, and additions are listed below.') . '
'; + $output .= '' . t('Pellentesque sit amet sem et purus pretium consectetuer.') . '
'; return $output; case 'config.export_full': diff --git a/core/modules/config/config.permissions.yml b/core/modules/config/config.permissions.yml index ee24216..5407f60 100644 --- a/core/modules/config/config.permissions.yml +++ b/core/modules/config/config.permissions.yml @@ -1,6 +1,3 @@ -synchronize configuration: - title: 'Synchronize configuration' - restrict access: true export configuration: title: 'Export configuration' restrict access: true diff --git a/core/modules/config/config.routing.yml b/core/modules/config/config.routing.yml index 8eebac3..d8a45ad 100644 --- a/core/modules/config/config.routing.yml +++ b/core/modules/config/config.routing.yml @@ -1,18 +1,10 @@ -config.sync: - path: '/admin/config/development/configuration' - defaults: - _form: '\Drupal\config\Form\ConfigSync' - _title: 'Synchronize' - requirements: - _permission: 'synchronize configuration' - config.diff: path: '/admin/config/development/configuration/sync/diff/{source_name}/{target_name}' defaults: _controller: '\Drupal\config\Controller\ConfigController::diff' target_name: NULL requirements: - _permission: 'synchronize configuration' + _permission: 'import configuration' config.diff_collection: path: '/admin/config/development/configuration/sync/diff_collection/{collection}/{source_name}/{target_name}' @@ -20,7 +12,7 @@ config.diff_collection: _controller: '\Drupal\config\Controller\ConfigController::diff' target_name: NULL requirements: - _permission: 'synchronize configuration' + _permission: 'import configuration' config.export_download: path: '/admin/config/development/configuration/full/export-download' @@ -62,3 +54,11 @@ config.export_single: config_name: NULL requirements: _permission: 'export configuration' + +config.import_full_import_confirm: + path: '/admin/config/development/configuration/full/import/confirm' + defaults: + _form: 'Drupal\config\Form\ConfigImportConfirmForm' + _title: 'Confirm configuration import' + requirements: + _permission: 'import configuration' diff --git a/core/modules/config/src/Controller/ConfigController.php b/core/modules/config/src/Controller/ConfigController.php index b6ee57a..a76fc92 100644 --- a/core/modules/config/src/Controller/ConfigController.php +++ b/core/modules/config/src/Controller/ConfigController.php @@ -156,8 +156,8 @@ public function diff($source_name, $target_name = NULL, $collection = NULL) { 'dialog-cancel', ), ), - '#title' => "Back to 'Synchronize configuration' page.", - '#url' => Url::fromRoute('config.sync'), + '#title' => "Back to 'Import configuration' page.", + '#url' => Url::fromRoute('config.import_full'), ); return $build; diff --git a/core/modules/config/src/Form/ConfigImportConfirmForm.php b/core/modules/config/src/Form/ConfigImportConfirmForm.php new file mode 100644 index 0000000..c72866d --- /dev/null +++ b/core/modules/config/src/Form/ConfigImportConfirmForm.php @@ -0,0 +1,265 @@ +eventDispatcher = $event_dispatcher; + $this->configManager = $config_manager; + $this->lock = $lock; + $this->typedConfigManager = $typed_config_manager; + $this->moduleHandler = $module_handler; + $this->moduleInstaller = $module_installer; + $this->themeHandler = $theme_handler; + $this->keyValueExpirable = $key_value_expirable; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('event_dispatcher'), + $container->get('config.manager'), + $container->get('lock.persistent'), + $container->get('config.typed'), + $container->get('module_handler'), + $container->get('module_installer'), + $container->get('theme_handler'), + $container->get('keyvalue.expirable')->get('config_import') + ); + } + + /** + * {@inheritdoc} + */ + public function buildForm(array $form, FormStateInterface $form_state) { + $account = $this->currentUser()->id(); + $this->storageComparer = $this->keyValueExpirable->get($account); + return parent::buildForm($form, $form_state); + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + $config_importer = new ConfigImporter( + $this->storageComparer, + $this->eventDispatcher, + $this->configManager, + $this->lock, + $this->typedConfigManager, + $this->moduleHandler, + $this->moduleInstaller, + $this->themeHandler, + $this->getStringTranslation() + ); + if ($config_importer->alreadyImporting()) { + drupal_set_message($this->t('Another request may be synchronizing configuration already.')); + } + else { + try { + $sync_steps = $config_importer->initialize(); + $batch = array( + 'operations' => array(), + 'finished' => array(get_class($this), 'finishBatch'), + 'title' => t('Synchronizing configuration'), + 'init_message' => t('Starting configuration synchronization.'), + 'progress_message' => t('Completed @current step of @total.'), + 'error_message' => t('Configuration synchronization has encountered an error.'), + 'file' => drupal_get_path('module', 'config') . '/config.admin.inc', + ); + foreach ($sync_steps as $sync_step) { + $batch['operations'][] = array( + array(get_class($this), 'processBatch'), + array($config_importer, $sync_step), + ); + } + + batch_set($batch); + $form_state->setRedirect('config.import_full'); + } + catch (ConfigImporterException $e) { + // There are validation errors. + drupal_set_message($this->t('The configuration cannot be imported because it failed validation for the following reasons:'), 'error'); + foreach ($config_importer->getErrors() as $message) { + drupal_set_message($message, 'error'); + } + } + } + } + + /** + * {@inheritdoc} + */ + public function getQuestion() { + return t('Confirm configuration import'); + } + + /** + * {@inheritdoc} + */ + public function getConfirmText() { + return $this->t('Import'); + } + + /** + * {@inheritdoc} + */ + public function getCancelUrl() { + return new Url('config.import_full'); + } + + /** + * Processes the config import batch and persists the importer. + * + * @param \Drupal\Core\Config\ConfigImporter $config_importer + * The batch config importer object to persist. + * @param string $sync_step + * The synchronization step to do. + * @param array $context + * The batch context. + */ + public static function processBatch(ConfigImporter $config_importer, $sync_step, &$context) { + if (!isset($context['sandbox']['config_importer'])) { + $context['sandbox']['config_importer'] = $config_importer; + } + + $config_importer = $context['sandbox']['config_importer']; + $config_importer->doSyncStep($sync_step, $context); + if ($errors = $config_importer->getErrors()) { + if (!isset($context['results']['errors'])) { + $context['results']['errors'] = array(); + } + $context['results']['errors'] += $errors; + } + } + + /** + * Finish batch. + * + * This function is a static function to avoid serializing the ConfigSync + * object unnecessarily. + */ + public static function finishBatch($success, $results, $operations) { + if ($success) { + if (!empty($results['errors'])) { + foreach ($results['errors'] as $error) { + drupal_set_message($error, 'error'); + \Drupal::logger('config_sync')->error($error); + } + drupal_set_message(\Drupal::translation()->translate('The configuration was imported with errors.'), 'warning'); + } + else { + drupal_set_message(\Drupal::translation()->translate('The configuration was imported successfully.')); + } + } + else { + // An error occurred. + // $operations contains the operations that remained unprocessed. + $error_operation = reset($operations); + $message = \Drupal::translation()->translate('An error occurred while processing %error_operation with arguments: @arguments', array( + '%error_operation' => $error_operation[0], + '@arguments' => print_r($error_operation[1], TRUE), + )); + drupal_set_message($message, 'error'); + } + } +} diff --git a/core/modules/config/src/Form/ConfigImportForm.php b/core/modules/config/src/Form/ConfigImportForm.php index 7b29e3f..0fc8b24 100644 --- a/core/modules/config/src/Form/ConfigImportForm.php +++ b/core/modules/config/src/Form/ConfigImportForm.php @@ -9,8 +9,13 @@ use Drupal\Core\Archiver\ArchiveTar; use Drupal\Core\Config\StorageInterface; +use Drupal\Core\Config\ConfigManagerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Config\StorageComparer; +use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface; +use Drupal\Core\Render\RendererInterface; +use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -26,13 +31,54 @@ class ConfigImportForm extends FormBase { protected $configStorage; /** + * The staging configuration object. + * + * @var \Drupal\Core\Config\StorageInterface + */ + protected $stagingStorage; + + /** + * The active configuration object. + * + * @var \Drupal\Core\Config\StorageInterface + */ + protected $activeStorage; + + /** + * The snapshot configuration object. + * + * @var \Drupal\Core\Config\StorageInterface + */ + protected $snapshotStorage; + + /** + * The configuration manager. + * + * @var \Drupal\Core\Config\ConfigManagerInterface; + */ + protected $configManager; + + /** + * The renderer. + * + * @var \Drupal\Core\Render\RendererInterface + */ + protected $renderer; + + /** * Constructs a new ConfigImportForm. * * @param \Drupal\Core\Config\StorageInterface $config_storage * The configuration storage. */ - public function __construct(StorageInterface $config_storage) { + public function __construct(StorageInterface $staging_storage, StorageInterface $active_storage, StorageInterface $snapshot_storage, StorageInterface $config_storage, ConfigManagerInterface $config_manager, KeyValueStoreExpirableInterface $key_value_expirable, RendererInterface $renderer) { + $this->stagingStorage = $staging_storage; + $this->activeStorage = $active_storage; + $this->snapshotStorage = $snapshot_storage; $this->configStorage = $config_storage; + $this->configManager = $config_manager; + $this->keyValueExpirable = $key_value_expirable; + $this->renderer = $renderer; } /** @@ -40,7 +86,13 @@ public function __construct(StorageInterface $config_storage) { */ public static function create(ContainerInterface $container) { return new static( - $container->get('config.storage.staging') + $container->get('config.storage.staging'), + $container->get('config.storage'), + $container->get('config.storage.snapshot'), + $container->get('config.storage.staging'), + $container->get('config.manager'), + $container->get('keyvalue.expirable')->get('config_import'), + $container->get('renderer') ); } @@ -65,6 +117,142 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'submit', '#value' => $this->t('Upload'), ); + + $source_list = $this->stagingStorage->listAll(); + $storage_comparer = new StorageComparer($this->stagingStorage, $this->activeStorage, $this->configManager); + if (empty($source_list) || !$storage_comparer->createChangelist()->hasChanges()) { + $form['no_changes'] = array( + '#type' => 'table', + '#header' => array('Name', 'Operations'), + '#rows' => array(), + '#empty' => $this->t('There are no configuration changes to import.'), + ); + $form['actions']['#access'] = FALSE; + return $form; + } + elseif (!$storage_comparer->validateSiteUuid()) { + drupal_set_message($this->t('The staged configuration cannot be imported, because it originates from a different site than this site. You can only synchronize configuration between cloned instances of this site.'), 'error'); + $form['actions']['#access'] = FALSE; + return $form; + } + + if ($this->snapshotStorage->exists('core.extension')) { + $snapshot_comparer = new StorageComparer($this->activeStorage, $this->snapshotStorage, $this->configManager); + if (!$form_state->getUserInput() && $snapshot_comparer->createChangelist()->hasChanges()) { + $change_list = array(); + foreach ($snapshot_comparer->getAllCollectionNames() as $collection) { + foreach ($snapshot_comparer->getChangelist(NULL, $collection) as $config_names) { + if (empty($config_names)) { + continue; + } + foreach ($config_names as $config_name) { + $change_list[] = $config_name; + } + } + } + sort($change_list); + $change_list_render = array( + '#theme' => 'item_list', + '#items' => $change_list, + ); + $change_list_html = $this->renderer->renderPlain($change_list_render); + drupal_set_message($this->t('The following items in your active configuration have changes since the last import that may be lost on the next import. !changes', array('!changes' => $change_list_html)), 'warning'); + } + } + + // Store the comparer for use in the submit. + $form_state->set('storage_comparer', $storage_comparer); + + // Add the AJAX library to the form for dialog support. + $form['#attached']['library'][] = 'core/drupal.ajax'; + + foreach ($storage_comparer->getAllCollectionNames() as $collection) { + if ($collection != StorageInterface::DEFAULT_COLLECTION) { + $form[$collection]['collection_heading'] = array( + '#type' => 'html_tag', + '#tag' => 'h2', + '#value' => $this->t('!collection configuration collection', array('!collection' => $collection)), + ); + } + foreach ($storage_comparer->getChangelist(NULL, $collection) as $config_change_type => $config_names) { + if (empty($config_names)) { + continue; + } + + // @todo A table caption would be more appropriate, but does not have + // the visual importance of a heading. + $form[$collection][$config_change_type]['heading'] = array( + '#type' => 'html_tag', + '#tag' => 'h3', + ); + switch ($config_change_type) { + case 'create': + $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count new', '@count new'); + break; + + case 'update': + $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count changed', '@count changed'); + break; + + case 'delete': + $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count removed', '@count removed'); + break; + + case 'rename': + $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count renamed', '@count renamed'); + break; + } + $form[$collection][$config_change_type]['list'] = array( + '#type' => 'table', + '#header' => array('Name', 'Operations'), + ); + + foreach ($config_names as $config_name) { + if ($config_change_type == 'rename') { + $names = $storage_comparer->extractRenameNames($config_name); + $route_options = array('source_name' => $names['old_name'], 'target_name' => $names['new_name']); + $config_name = $this->t('!source_name to !target_name', array('!source_name' => $names['old_name'], '!target_name' => $names['new_name'])); + } + else { + $route_options = array('source_name' => $config_name); + } + if ($collection != StorageInterface::DEFAULT_COLLECTION) { + $route_name = 'config.diff_collection'; + $route_options['collection'] = $collection; + } + else { + $route_name = 'config.diff'; + } + $links['view_diff'] = array( + 'title' => $this->t('View differences'), + 'url' => Url::fromRoute($route_name, $route_options), + 'attributes' => array( + 'class' => array('use-ajax'), + 'data-dialog-type' => 'modal', + 'data-dialog-options' => json_encode(array( + 'width' => 700, + )), + ), + ); + $form[$collection][$config_change_type]['list']['#rows'][] = array( + 'name' => $config_name, + 'operations' => array( + 'data' => array( + '#type' => 'operations', + '#links' => $links, + ), + ), + ); + } + } + } + + $form['import'] = array( + '#type' => 'submit', + '#value' => $this->t('Import all'), + ); + + return $form; } @@ -72,12 +260,14 @@ public function buildForm(array $form, FormStateInterface $form_state) { * {@inheritdoc} */ public function validateForm(array &$form, FormStateInterface $form_state) { - $file_upload = $this->getRequest()->files->get('files[import_tarball]', NULL, TRUE); - if ($file_upload && $file_upload->isValid()) { - $form_state->setValue('import_tarball', $file_upload->getRealPath()); - } - else { - $form_state->setErrorByName('import_tarball', $this->t('The file could not be uploaded.')); + if ($form_state->getValue('op') == t('Upload')) { + $file_upload = $this->getRequest()->files->get('files[import_tarball]', NULL, TRUE); + if ($file_upload && $file_upload->isValid()) { + $form_state->setValue('import_tarball', $file_upload->getRealPath()); + } + else { + $form_state->setErrorByName('import_tarball', $this->t('The file could not be uploaded.')); + } } } @@ -85,24 +275,32 @@ public function validateForm(array &$form, FormStateInterface $form_state) { * {@inheritdoc} */ public function submitForm(array &$form, FormStateInterface $form_state) { - if ($path = $form_state->getValue('import_tarball')) { - $this->configStorage->deleteAll(); - try { - $archiver = new ArchiveTar($path, 'gz'); - $files = array(); - foreach ($archiver->listContent() as $file) { - $files[] = $file['filename']; + if ($form_state->getValue('op') == t('Upload')) { + if ($path = $form_state->getValue('import_tarball')) { + $this->configStorage->deleteAll(); + try { + $archiver = new ArchiveTar($path, 'gz'); + $files = array(); + foreach ($archiver->listContent() as $file) { + $files[] = $file['filename']; + } + $archiver->extractList($files, config_get_config_directory(CONFIG_STAGING_DIRECTORY)); + drupal_set_message($this->t('Your configuration files were successfully uploaded and are ready for import.')); + $form_state->setRedirect('config.import_full'); + } catch (\Exception $e) { + drupal_set_message($this->t('Could not extract the contents of the tar file. The error message is @message', array('@message' => $e->getMessage())), 'error'); } - $archiver->extractList($files, config_get_config_directory(CONFIG_STAGING_DIRECTORY)); - drupal_set_message($this->t('Your configuration files were successfully uploaded and are ready for import.')); - $form_state->setRedirect('config.sync'); + drupal_unlink($path); } - catch (\Exception $e) { - drupal_set_message($this->t('Could not extract the contents of the tar file. The error message is @message', array('@message' => $e->getMessage())), 'error'); - } - drupal_unlink($path); } - } + else { + $account = $this->currentUser()->id(); + $this->keyValueExpirable->setWithExpire($account, $form_state->get('storage_comparer'), 60); + // Redirect to the confirmation form. + $form_state->setRedirect('config.import_full_import_confirm'); + return; + } + } } diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php deleted file mode 100644 index 7f240e3..0000000 --- a/core/modules/config/src/Form/ConfigSync.php +++ /dev/null @@ -1,418 +0,0 @@ -stagingStorage = $staging_storage; - $this->activeStorage = $active_storage; - $this->snapshotStorage = $snapshot_storage; - $this->lock = $lock; - $this->eventDispatcher = $event_dispatcher; - $this->configManager = $config_manager; - $this->typedConfigManager = $typed_config; - $this->moduleHandler = $module_handler; - $this->moduleInstaller = $module_installer; - $this->themeHandler = $theme_handler; - $this->renderer = $renderer; - } - - /** - * {@inheritdoc} - */ - public static function create(ContainerInterface $container) { - return new static( - $container->get('config.storage.staging'), - $container->get('config.storage'), - $container->get('config.storage.snapshot'), - $container->get('lock.persistent'), - $container->get('event_dispatcher'), - $container->get('config.manager'), - $container->get('config.typed'), - $container->get('module_handler'), - $container->get('module_installer'), - $container->get('theme_handler'), - $container->get('renderer') - ); - } - - /** - * {@inheritdoc} - */ - public function getFormId() { - return 'config_admin_import_form'; - } - - /** - * {@inheritdoc} - */ - public function buildForm(array $form, FormStateInterface $form_state) { - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => $this->t('Import all'), - ); - $source_list = $this->stagingStorage->listAll(); - $storage_comparer = new StorageComparer($this->stagingStorage, $this->activeStorage, $this->configManager); - if (empty($source_list) || !$storage_comparer->createChangelist()->hasChanges()) { - $form['no_changes'] = array( - '#type' => 'table', - '#header' => array('Name', 'Operations'), - '#rows' => array(), - '#empty' => $this->t('There are no configuration changes to import.'), - ); - $form['actions']['#access'] = FALSE; - return $form; - } - elseif (!$storage_comparer->validateSiteUuid()) { - drupal_set_message($this->t('The staged configuration cannot be imported, because it originates from a different site than this site. You can only synchronize configuration between cloned instances of this site.'), 'error'); - $form['actions']['#access'] = FALSE; - return $form; - } - // A list of changes will be displayed, so check if the user should be - // warned of potential losses to configuration. - if ($this->snapshotStorage->exists('core.extension')) { - $snapshot_comparer = new StorageComparer($this->activeStorage, $this->snapshotStorage, $this->configManager); - if (!$form_state->getUserInput() && $snapshot_comparer->createChangelist()->hasChanges()) { - $change_list = array(); - foreach ($snapshot_comparer->getAllCollectionNames() as $collection) { - foreach ($snapshot_comparer->getChangelist(NULL, $collection) as $config_names) { - if (empty($config_names)) { - continue; - } - foreach ($config_names as $config_name) { - $change_list[] = $config_name; - } - } - } - sort($change_list); - $change_list_render = array( - '#theme' => 'item_list', - '#items' => $change_list, - ); - $change_list_html = $this->renderer->renderPlain($change_list_render); - drupal_set_message($this->t('The following items in your active configuration have changes since the last import that may be lost on the next import. !changes', array('!changes' => $change_list_html)), 'warning'); - } - } - - // Store the comparer for use in the submit. - $form_state->set('storage_comparer', $storage_comparer); - - // Add the AJAX library to the form for dialog support. - $form['#attached']['library'][] = 'core/drupal.ajax'; - - foreach ($storage_comparer->getAllCollectionNames() as $collection) { - if ($collection != StorageInterface::DEFAULT_COLLECTION) { - $form[$collection]['collection_heading'] = array( - '#type' => 'html_tag', - '#tag' => 'h2', - '#value' => $this->t('!collection configuration collection', array('!collection' => $collection)), - ); - } - foreach ($storage_comparer->getChangelist(NULL, $collection) as $config_change_type => $config_names) { - if (empty($config_names)) { - continue; - } - - // @todo A table caption would be more appropriate, but does not have the - // visual importance of a heading. - $form[$collection][$config_change_type]['heading'] = array( - '#type' => 'html_tag', - '#tag' => 'h3', - ); - switch ($config_change_type) { - case 'create': - $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count new', '@count new'); - break; - - case 'update': - $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count changed', '@count changed'); - break; - - case 'delete': - $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count removed', '@count removed'); - break; - - case 'rename': - $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count renamed', '@count renamed'); - break; - } - $form[$collection][$config_change_type]['list'] = array( - '#type' => 'table', - '#header' => array('Name', 'Operations'), - ); - - foreach ($config_names as $config_name) { - if ($config_change_type == 'rename') { - $names = $storage_comparer->extractRenameNames($config_name); - $route_options = array('source_name' => $names['old_name'], 'target_name' => $names['new_name']); - $config_name = $this->t('!source_name to !target_name', array('!source_name' => $names['old_name'], '!target_name' => $names['new_name'])); - } - else { - $route_options = array('source_name' => $config_name); - } - if ($collection != StorageInterface::DEFAULT_COLLECTION) { - $route_name = 'config.diff_collection'; - $route_options['collection'] = $collection; - } - else { - $route_name = 'config.diff'; - } - $links['view_diff'] = array( - 'title' => $this->t('View differences'), - 'url' => Url::fromRoute($route_name, $route_options), - 'attributes' => array( - 'class' => array('use-ajax'), - 'data-dialog-type' => 'modal', - 'data-dialog-options' => json_encode(array( - 'width' => 700 - )), - ), - ); - $form[$collection][$config_change_type]['list']['#rows'][] = array( - 'name' => $config_name, - 'operations' => array( - 'data' => array( - '#type' => 'operations', - '#links' => $links, - ), - ), - ); - } - } - } - return $form; - } - - /** - * {@inheritdoc} - */ - public function submitForm(array &$form, FormStateInterface $form_state) { - $config_importer = new ConfigImporter( - $form_state->get('storage_comparer'), - $this->eventDispatcher, - $this->configManager, - $this->lock, - $this->typedConfigManager, - $this->moduleHandler, - $this->moduleInstaller, - $this->themeHandler, - $this->getStringTranslation() - ); - if ($config_importer->alreadyImporting()) { - drupal_set_message($this->t('Another request may be synchronizing configuration already.')); - } - else{ - try { - $sync_steps = $config_importer->initialize(); - $batch = array( - 'operations' => array(), - 'finished' => array(get_class($this), 'finishBatch'), - 'title' => t('Synchronizing configuration'), - 'init_message' => t('Starting configuration synchronization.'), - 'progress_message' => t('Completed @current step of @total.'), - 'error_message' => t('Configuration synchronization has encountered an error.'), - 'file' => drupal_get_path('module', 'config') . '/config.admin.inc', - ); - foreach ($sync_steps as $sync_step) { - $batch['operations'][] = array(array(get_class($this), 'processBatch'), array($config_importer, $sync_step)); - } - - batch_set($batch); - } - catch (ConfigImporterException $e) { - // There are validation errors. - drupal_set_message($this->t('The configuration cannot be imported because it failed validation for the following reasons:'), 'error'); - foreach ($config_importer->getErrors() as $message) { - drupal_set_message($message, 'error'); - } - } - } - } - - /** - * Processes the config import batch and persists the importer. - * - * @param \Drupal\Core\Config\ConfigImporter $config_importer - * The batch config importer object to persist. - * @param string $sync_step - * The synchronization step to do. - * @param array $context - * The batch context. - */ - public static function processBatch(ConfigImporter $config_importer, $sync_step, &$context) { - if (!isset($context['sandbox']['config_importer'])) { - $context['sandbox']['config_importer'] = $config_importer; - } - - $config_importer = $context['sandbox']['config_importer']; - $config_importer->doSyncStep($sync_step, $context); - if ($errors = $config_importer->getErrors()) { - if (!isset($context['results']['errors'])) { - $context['results']['errors'] = array(); - } - $context['results']['errors'] += $errors; - } - } - - /** - * Finish batch. - * - * This function is a static function to avoid serializing the ConfigSync - * object unnecessarily. - */ - public static function finishBatch($success, $results, $operations) { - if ($success) { - if (!empty($results['errors'])) { - foreach ($results['errors'] as $error) { - drupal_set_message($error, 'error'); - \Drupal::logger('config_sync')->error($error); - } - drupal_set_message(\Drupal::translation()->translate('The configuration was imported with errors.'), 'warning'); - } - else { - drupal_set_message(\Drupal::translation()->translate('The configuration was imported successfully.')); - } - } - else { - // An error occurred. - // $operations contains the operations that remained unprocessed. - $error_operation = reset($operations); - $message = \Drupal::translation()->translate('An error occurred while processing %error_operation with arguments: @arguments', array('%error_operation' => $error_operation[0], '@arguments' => print_r($error_operation[1], TRUE))); - drupal_set_message($message, 'error'); - } - } - - -} diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/src/Tests/ConfigExportImportUITest.php index 6a63df7..0878ede 100644 --- a/core/modules/config/src/Tests/ConfigExportImportUITest.php +++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php @@ -91,7 +91,7 @@ protected function setUp() { */ public function testExportImport() { // After installation there is no snapshot and nothing to import. - $this->drupalGet('admin/config/development/configuration'); + $this->drupalGet('admin/config/development/configuration/full/import'); $this->assertNoText(t('Warning message')); $this->assertText(t('There are no configuration changes to import.')); @@ -173,6 +173,11 @@ public function testExportImport() { $this->assertText($this->contentType->label()); $this->drupalPostForm(NULL, array(), 'Import all'); + + // We now have to confirm the import. + $this->assertText(t('This action cannot be undone.')); + $this->drupalPostForm('admin/config/development/configuration/full/import/confirm', array(), 'Import'); + // After importing the snapshot has been updated an there are no warnings. $this->assertNoText(t('Warning message')); $this->assertText(t('There are no configuration changes to import.')); @@ -185,13 +190,13 @@ public function testExportImport() { $this->config('system.site') ->set('slogan', $this->originalSlogan) ->save(); - $this->drupalGet('admin/config/development/configuration'); + $this->drupalGet('admin/config/development/configuration/full/import'); $this->assertText(t('Warning message')); $this->assertText('The following items in your active configuration have changes since the last import that may be lost on the next import. system.site'); // Remove everything from staging. The warning about differences between the // active and snapshot should no longer exist. \Drupal::service('config.storage.staging')->deleteAll(); - $this->drupalGet('admin/config/development/configuration'); + $this->drupalGet('admin/config/development/configuration/full/import'); $this->assertNoText(t('Warning message')); $this->assertNoText('The following items in your active configuration have changes since the last import that may be lost on the next import. system.site'); $this->assertText(t('There are no configuration changes to import.')); @@ -203,7 +208,7 @@ public function testExportImport() { $data['slogan'] = 'in the face'; $this->copyConfig($this->container->get('config.storage'), $staging); $staging->write('system.site', $data); - $this->drupalGet('admin/config/development/configuration'); + $this->drupalGet('admin/config/development/configuration/full/import'); $this->assertText(t('Warning message')); $this->assertText('The following items in your active configuration have changes since the last import that may be lost on the next import. system.site'); } @@ -271,7 +276,7 @@ public function testExportImportCollections() { $this->drupalPostForm('admin/config/development/configuration/full/import', array('files[import_tarball]' => $filename), 'Upload'); // Verify that there are configuration differences to import. - $this->drupalGet('admin/config/development/configuration'); + $this->drupalGet('admin/config/development/configuration/full/import'); $this->assertNoText(t('There are no configuration changes to import.')); $this->assertText(t('!collection configuration collection', array('!collection' => 'collection.test1'))); $this->assertText(t('!collection configuration collection', array('!collection' => 'collection.test2'))); @@ -289,6 +294,11 @@ public function testExportImportCollections() { $this->assertLinkByHref('admin/config/development/configuration/sync/diff_collection/collection.test2/config_test.another_delete'); $this->drupalPostForm(NULL, array(), 'Import all'); + + // We now have to confirm the import. + $this->assertText(t('This action cannot be undone.')); + $this->drupalPostForm('admin/config/development/configuration/full/import/confirm', array(), 'Import'); + $this->assertText(t('There are no configuration changes to import.')); // Test data in collections. diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/src/Tests/ConfigImportAllTest.php index 6e1aaea..dd0575b 100644 --- a/core/modules/config/src/Tests/ConfigImportAllTest.php +++ b/core/modules/config/src/Tests/ConfigImportAllTest.php @@ -23,7 +23,7 @@ class ConfigImportAllTest extends ModuleTestBase { use SchemaCheckTestTrait; /** - * A user with the 'synchronize configuration' permission. + * A user with the 'Import configuration' permission. * * @var \Drupal\user\UserInterface */ @@ -41,7 +41,7 @@ class ConfigImportAllTest extends ModuleTestBase { protected function setUp() { parent::setUp(); - $this->webUser = $this->drupalCreateUser(array('synchronize configuration')); + $this->webUser = $this->drupalCreateUser(array('import configuration')); $this->drupalLogin($this->webUser); } @@ -129,7 +129,8 @@ public function testInstallUninstall() { } // Import the configuration thereby re-installing all the modules. - $this->drupalPostForm('admin/config/development/configuration', array(), t('Import all')); + $this->drupalPostForm('admin/config/development/configuration/full/import', array(), t('Import all')); + $this->drupalPostForm('admin/config/development/configuration/full/import/confirm', array(), 'Import'); // Modules have been installed that have services. $this->rebuildContainer(); diff --git a/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php b/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php index 64b2d5d..d294239 100644 --- a/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php +++ b/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php @@ -31,7 +31,7 @@ class ConfigImportInstallProfileTest extends WebTestBase { public static $modules = array('config'); /** - * A user with the 'synchronize configuration' permission. + * A user with the 'import configuration' permission. * * @var \Drupal\user\UserInterface */ @@ -40,7 +40,7 @@ class ConfigImportInstallProfileTest extends WebTestBase { protected function setUp() { parent::setUp(); - $this->webUser = $this->drupalCreateUser(array('synchronize configuration')); + $this->webUser = $this->drupalCreateUser(array('import configuration')); $this->drupalLogin($this->webUser); $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.staging')); } @@ -59,7 +59,8 @@ public function testInstallProfileValidation() { unset($core['module']['testing_config_import']); $staging->write('core.extension', $core); - $this->drupalPostForm('admin/config/development/configuration', array(), t('Import all')); + $this->drupalPostForm('admin/config/development/configuration/full/import', array(), t('Import all')); + $this->drupalPostForm('admin/config/development/configuration/full/import/confirm', array(), t('Import')); $this->assertText('The configuration cannot be imported because it failed validation for the following reasons:'); $this->assertText('Unable to uninstall the Testing config import profile since it is the install profile.'); @@ -73,7 +74,8 @@ public function testInstallProfileValidation() { $theme = $staging->read('system.theme'); $theme['default'] = 'classy'; $staging->write('system.theme', $theme); - $this->drupalPostForm('admin/config/development/configuration', array(), t('Import all')); + $this->drupalPostForm('admin/config/development/configuration/full/import', array(), t('Import all')); + $this->drupalPostForm('admin/config/development/configuration/full/import/confirm', array(), t('Import')); $this->assertText('The configuration was imported successfully.'); $this->rebuildContainer(); $this->assertFalse(\Drupal::moduleHandler()->moduleExists('syslog'), 'The syslog module has been uninstalled.'); diff --git a/core/modules/config/src/Tests/ConfigImportUITest.php b/core/modules/config/src/Tests/ConfigImportUITest.php index dd00edf..219edfa 100644 --- a/core/modules/config/src/Tests/ConfigImportUITest.php +++ b/core/modules/config/src/Tests/ConfigImportUITest.php @@ -26,7 +26,7 @@ class ConfigImportUITest extends WebTestBase { public static $modules = array('config', 'config_test', 'config_import_test', 'text', 'options'); /** - * A user with the 'synchronize configuration' permission. + * A user with the 'Import configuration' permission. * * @var \Drupal\user\UserInterface */ @@ -35,7 +35,7 @@ class ConfigImportUITest extends WebTestBase { protected function setUp() { parent::setUp(); - $this->webUser = $this->drupalCreateUser(array('synchronize configuration')); + $this->webUser = $this->drupalCreateUser(array('import configuration')); $this->drupalLogin($this->webUser); $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.staging')); } @@ -49,7 +49,7 @@ function testImport() { /** @var \Drupal\Core\Config\StorageInterface $staging */ $staging = $this->container->get('config.storage.staging'); - $this->drupalGet('admin/config/development/configuration'); + $this->drupalGet('admin/config/development/configuration/full/import'); $this->assertText('There are no configuration changes to import.'); $this->assertNoFieldById('edit-submit', t('Import all')); @@ -113,23 +113,24 @@ function testImport() { \Drupal::state()->set('ConfigImportUITest.core.extension.modules_uninstalled', array()); // Verify that both appear as ready to import. - $this->drupalGet('admin/config/development/configuration'); + $this->drupalGet('admin/config/development/configuration/full/import'); $this->assertRaw('