reverted: --- b/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php +++ a/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php @@ -11,7 +11,6 @@ use Drupal\Core\Form\FormBase; use Drupal\Component\Archiver\ArchiveTar; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\Core\Config\StorageComparer; /** * Defines the configuration import form. @@ -31,10 +30,8 @@ * @param \Drupal\Core\Config\StorageInterface $config_storage * The configuration storage. */ + public function __construct(StorageInterface $config_storage) { - public function __construct(StorageInterface $config_storage, StorageInterface $config_storage_snapshot, StorageInterface $config_storage_active) { $this->configStorage = $config_storage; - $this->configStorageSnapshot = $config_storage_snapshot; - $this->configStorageActive = $config_storage_active; } /** @@ -42,9 +39,7 @@ */ public static function create(ContainerInterface $container) { return new static( + $container->get('config.storage.staging') - $container->get('config.storage.staging'), - $container->get('config.storage.snapshot'), - $container->get('config.storage') ); } @@ -59,15 +54,6 @@ * {@inheritdoc} */ public function buildForm(array $form, array &$form_state) { - $active_snapshot_comparer = new StorageComparer($this->configStorageActive, $this->configStorageSnapshot); - - // Verify that we have an initial snapshot that matches the active - // configuration. - if ($active_snapshot_comparer->createChangelist()->hasChanges()) { - drupal_set_message($this->t('Changes have been made to your active configuration, which might be lost on the next import attempt. You can find and review the differences between snapshot and active/staging storage here: Compare snapshot and active/staging storage.', array( - '@link' => $this->url('config.snapshot_diff', array('storage' => 'active')))), 'warning'); - } - $form['description'] = array( '#markup' => '
' . $this->t('Use the upload button below.') . '
', ); diff -u b/core/modules/config/lib/Drupal/config/Tests/ConfigExportImportUITest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigExportImportUITest.php --- b/core/modules/config/lib/Drupal/config/Tests/ConfigExportImportUITest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigExportImportUITest.php @@ -145,11 +145,6 @@ $this->assertText('Changes have been made to your active configuration, which might be lost on the next import attempt. ' . 'You can find and review the differences between snapshot and active/staging storage here'); - $this->drupalGet('admin/config/development/configuration/full/import'); - - $this->assertText('Changes have been made to your active configuration, which might be lost on the next import attempt. ' . - 'You can find and review the differences between snapshot and active/staging storage here'); - $this->clickLink('Compare snapshot and active/staging storage'); $this->assertText('View changes between snapshot and active configuration'); $this->assertText('system.site');