' . t('Import configuration that is placed in your staging directory. All changes, deletions, renames, and additions are listed below.') . '
'; + $output .= '' . t('Import configuration that is placed in your import directory. All changes, deletions, renames, and additions are listed below.') . '
'; return $output; } } diff --git a/core/modules/config/src/Controller/ConfigController.php b/core/modules/config/src/Controller/ConfigController.php index dc56910..1f3eea3 100644 --- a/core/modules/config/src/Controller/ConfigController.php +++ b/core/modules/config/src/Controller/ConfigController.php @@ -64,7 +64,7 @@ class ConfigController implements ContainerInjectionInterface { public static function create(ContainerInterface $container) { return new static( $container->get('config.storage'), - $container->get('config.storage.staging'), + $container->get('config.storage.import'), $container->get('config.manager'), new FileDownloadController(), $container->get('diff.formatter') diff --git a/core/modules/config/src/Form/ConfigImportForm.php b/core/modules/config/src/Form/ConfigImportForm.php index 9ed9b83..194eb71 100644 --- a/core/modules/config/src/Form/ConfigImportForm.php +++ b/core/modules/config/src/Form/ConfigImportForm.php @@ -40,7 +40,7 @@ public function __construct(StorageInterface $config_storage) { */ public static function create(ContainerInterface $container) { return new static( - $container->get('config.storage.staging') + $container->get('config.storage.import') ); } @@ -96,7 +96,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { foreach ($archiver->listContent() as $file) { $files[] = $file['filename']; } - $archiver->extractList($files, config_get_config_directory(CONFIG_STAGING_DIRECTORY)); + $archiver->extractList($files, config_get_config_directory(CONFIG_IMPORT_DIRECTORY)); drupal_set_message($this->t('Your configuration files were successfully uploaded, ready for import.')); $form_state->setRedirect('config.sync'); } diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php index b97218b..d7f7082 100644 --- a/core/modules/config/src/Form/ConfigSync.php +++ b/core/modules/config/src/Form/ConfigSync.php @@ -38,11 +38,11 @@ class ConfigSync extends FormBase { protected $lock; /** - * The staging configuration object. + * The import configuration storage. * * @var \Drupal\Core\Config\StorageInterface */ - protected $stagingStorage; + protected $importStorage; /** * The active configuration object. @@ -103,7 +103,7 @@ class ConfigSync extends FormBase { /** * Constructs the object. * - * @param \Drupal\Core\Config\StorageInterface $staging_storage + * @param \Drupal\Core\Config\StorageInterface $import_storage * The source storage. * @param \Drupal\Core\Config\StorageInterface $active_storage * The target storage. @@ -124,8 +124,8 @@ class ConfigSync extends FormBase { * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler * The theme handler */ - public function __construct(StorageInterface $staging_storage, StorageInterface $active_storage, StorageInterface $snapshot_storage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler) { - $this->stagingStorage = $staging_storage; + public function __construct(StorageInterface $import_storage, StorageInterface $active_storage, StorageInterface $snapshot_storage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler) { + $this->importStorage = $import_storage; $this->activeStorage = $active_storage; $this->snapshotStorage = $snapshot_storage; $this->lock = $lock; @@ -142,7 +142,7 @@ public function __construct(StorageInterface $staging_storage, StorageInterface */ public static function create(ContainerInterface $container) { return new static( - $container->get('config.storage.staging'), + $container->get('config.storage.import'), $container->get('config.storage'), $container->get('config.storage.snapshot'), $container->get('lock.persistent'), @@ -194,8 +194,8 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'submit', '#value' => $this->t('Import all'), ); - $source_list = $this->stagingStorage->listAll(); - $storage_comparer = new StorageComparer($this->stagingStorage, $this->activeStorage, $this->configManager); + $source_list = $this->importStorage->listAll(); + $storage_comparer = new StorageComparer($this->importStorage, $this->activeStorage, $this->configManager); if (empty($source_list) || !$storage_comparer->createChangelist()->hasChanges()) { $form['no_changes'] = array( '#type' => 'table', diff --git a/core/modules/config/src/Tests/ConfigStagingBcTest.php b/core/modules/config/src/Tests/ConfigStagingBcTest.php new file mode 100644 index 0000000..4efb937 --- /dev/null +++ b/core/modules/config/src/Tests/ConfigStagingBcTest.php @@ -0,0 +1,43 @@ +assertEqual($this->configDirectories[CONFIG_IMPORT_DIRECTORY], config_get_config_directory(CONFIG_STAGING_DIRECTORY), 'The import config directory can be accessed with CONFIG_STAGING_DIRECTORY if no staging key exists.'); + + // Reset the global variable. + $config_directories = []; + // Pre-configure config directories. + $settings['config_directories'] = array( + CONFIG_STAGING_DIRECTORY => (object) array( + 'value' => $this->publicFilesDirectory . '/config_staging', + 'required' => TRUE, + ), + ); + $this->writeSettings($settings); + $this->assertEqual($this->publicFilesDirectory . '/config_staging', config_get_config_directory(CONFIG_IMPORT_DIRECTORY), 'The import config directory can be accessed with CONFIG_IMPORT_DIRECTORY if only staging key exists.'); + + } + +} diff --git a/core/modules/field/src/Tests/FieldImportCreateTest.php b/core/modules/field/src/Tests/FieldImportCreateTest.php index 0d46566..4a334bf 100644 --- a/core/modules/field/src/Tests/FieldImportCreateTest.php +++ b/core/modules/field/src/Tests/FieldImportCreateTest.php @@ -98,7 +98,7 @@ function testImportCreate() { // Add the new files to the staging directory. $src_dir = drupal_get_path('module', 'field_test_config') . '/staging'; - $target_dir = $this->configDirectories[CONFIG_STAGING_DIRECTORY]; + $target_dir = $this->configDirectories[CONFIG_IMPORT_DIRECTORY]; $this->assertTrue(file_unmanaged_copy("$src_dir/$field_storage_config_name.yml", "$target_dir/$field_storage_config_name.yml")); $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name.yml", "$target_dir/$field_config_name.yml")); $this->assertTrue(file_unmanaged_copy("$src_dir/$field_storage_config_name_2.yml", "$target_dir/$field_storage_config_name_2.yml")); diff --git a/core/modules/node/src/Tests/Config/NodeImportCreateTest.php b/core/modules/node/src/Tests/Config/NodeImportCreateTest.php index 97fe51f..eb4bc09 100644 --- a/core/modules/node/src/Tests/Config/NodeImportCreateTest.php +++ b/core/modules/node/src/Tests/Config/NodeImportCreateTest.php @@ -65,7 +65,7 @@ public function testImportCreate() { $this->copyConfig($active, $staging); // Manually add new node type. $src_dir = drupal_get_path('module', 'node_test_config') . '/staging'; - $target_dir = $this->configDirectories[CONFIG_STAGING_DIRECTORY]; + $target_dir = $this->configDirectories[CONFIG_IMPORT_DIRECTORY]; $this->assertTrue(file_unmanaged_copy("$src_dir/$node_type_config_name.yml", "$target_dir/$node_type_config_name.yml")); // Import the content of the staging directory. diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php index 5abf972..f6cb600 100644 --- a/core/modules/simpletest/src/KernelTestBase.php +++ b/core/modules/simpletest/src/KernelTestBase.php @@ -112,13 +112,13 @@ protected function beforePrepareEnvironment() { * @see config_get_config_directory() * * @throws \RuntimeException - * Thrown when CONFIG_ACTIVE_DIRECTORY or CONFIG_STAGING_DIRECTORY cannot + * Thrown when CONFIG_ACTIVE_DIRECTORY or CONFIG_IMPORT_DIRECTORY cannot * be created or made writable. */ protected function prepareConfigDirectories() { $this->configDirectories = array(); include_once DRUPAL_ROOT . '/core/includes/install.inc'; - foreach (array(CONFIG_ACTIVE_DIRECTORY, CONFIG_STAGING_DIRECTORY) as $type) { + foreach (array(CONFIG_ACTIVE_DIRECTORY, CONFIG_IMPORT_DIRECTORY) as $type) { // Assign the relative path to the global variable. $path = $this->siteDirectory . '/config_' . $type; $GLOBALS['config_directories'][$type] = $path; diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php index 9a38774..14b0c8b 100644 --- a/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -1604,7 +1604,7 @@ public function configImporter() { if (!$this->configImporter) { // Set up the ConfigImporter object for testing. $storage_comparer = new StorageComparer( - $this->container->get('config.storage.staging'), + $this->container->get('config.storage.import'), $this->container->get('config.storage'), $this->container->get('config.manager') ); diff --git a/core/modules/system/core.api.php b/core/modules/system/core.api.php index 14c894a..f9b4b0e 100644 --- a/core/modules/system/core.api.php +++ b/core/modules/system/core.api.php @@ -110,7 +110,7 @@ * and HAL. * - Node entity support is configured by default. If you would like to support * other types of entities, you can copy - * core/modules/rest/config/install/rest.settings.yml to your staging + * core/modules/rest/config/install/rest.settings.yml to your import * configuration directory, appropriately modified for other entity types, * and import it. Support for GET on the log from the Database Logging module * can also be enabled in this way; in this case, the 'entity:node' line diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php b/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php index 61dd5be..79a20f8 100644 --- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php @@ -48,13 +48,13 @@ protected function setUp() { 'value' => conf_path() . '/files/config_active', 'required' => TRUE, ), - CONFIG_STAGING_DIRECTORY => (object) array( - 'value' => conf_path() . '/files/config_staging', + CONFIG_IMPORT_DIRECTORY => (object) array( + 'value' => conf_path() . '/files/config_import', 'required' => TRUE, ), ); mkdir($this->settings['config_directories'][CONFIG_ACTIVE_DIRECTORY]->value, 0777, TRUE); - mkdir($this->settings['config_directories'][CONFIG_STAGING_DIRECTORY]->value, 0777, TRUE); + mkdir($this->settings['config_directories'][CONFIG_IMPORT_DIRECTORY]->value, 0777, TRUE); parent::setUp(); } diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php b/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php index 25be1ef..89b6dab 100644 --- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php @@ -54,13 +54,13 @@ protected function setUp() { 'value' => conf_path() . '/files/config_active', 'required' => TRUE, ), - CONFIG_STAGING_DIRECTORY => (object) array( - 'value' => conf_path() . '/files/config_staging', + CONFIG_IMPORT_DIRECTORY => (object) array( + 'value' => conf_path() . '/files/config_import', 'required' => TRUE, ), ); mkdir($this->settings['config_directories'][CONFIG_ACTIVE_DIRECTORY]->value, 0777, TRUE); - mkdir($this->settings['config_directories'][CONFIG_STAGING_DIRECTORY]->value, 0777, TRUE); + mkdir($this->settings['config_directories'][CONFIG_IMPORT_DIRECTORY]->value, 0777, TRUE); parent::setUp(); }