Commit 18e0fca3 authored by webchick's avatar webchick

Issue #1788462 by samhassell: Remove references to 'active store' in comments...

Issue #1788462 by samhassell: Remove references to 'active store' in comments for configuration system.
parent 9fbe7440
...@@ -28,7 +28,7 @@ function config_install_default_config($type, $name) { ...@@ -28,7 +28,7 @@ function config_install_default_config($type, $name) {
// Upon installation, only new config objects need to be created. // Upon installation, only new config objects need to be created.
// config_sync_get_changes() would potentially perform a diff of hundreds or // config_sync_get_changes() would potentially perform a diff of hundreds or
// even thousands of config objects that happen to be contained in the // even thousands of config objects that happen to be contained in the
// active store. We leverage the NullStorage to avoid that needless // active configuration. We leverage the NullStorage to avoid that needless
// computation of differences. // computation of differences.
$config_changes = config_sync_get_changes($source_storage, $null_storage); $config_changes = config_sync_get_changes($source_storage, $null_storage);
if (empty($config_changes)) { if (empty($config_changes)) {
...@@ -128,14 +128,14 @@ function config_sync_changes(array $config_changes, StorageInterface $source_sto ...@@ -128,14 +128,14 @@ function config_sync_changes(array $config_changes, StorageInterface $source_sto
} }
/** /**
* Imports configuration into the active store. * Imports configuration into the active configuration.
* *
* @return bool|null * @return bool|null
* TRUE if configuration was imported successfully, FALSE in case of a * TRUE if configuration was imported successfully, FALSE in case of a
* synchronization error, or NULL if there are no changes to synchronize. * synchronization error, or NULL if there are no changes to synchronize.
*/ */
function config_import() { function config_import() {
// Retrieve a list of differences between staging and the active store. // Retrieve a list of differences between staging and the active configuration.
$source_storage = drupal_container()->get('config.storage.staging'); $source_storage = drupal_container()->get('config.storage.staging');
$target_storage = drupal_container()->get('config.storage'); $target_storage = drupal_container()->get('config.storage');
...@@ -213,10 +213,10 @@ function config_import_invoke_owner(array $config_changes, StorageInterface $sou ...@@ -213,10 +213,10 @@ function config_import_invoke_owner(array $config_changes, StorageInterface $sou
} }
/** /**
* Exports configuration from the active store to staging. * Exports the active configuration to staging.
*/ */
function config_export() { function config_export() {
// Retrieve a list of differences between the active store and staging. // Retrieve a list of differences between the active configuration and staging.
$source_storage = drupal_container()->get('config.storage'); $source_storage = drupal_container()->get('config.storage');
$target_storage = drupal_container()->get('config.storage.staging'); $target_storage = drupal_container()->get('config.storage.staging');
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
* The stub implementation is needed for synchronizing configuration during * The stub implementation is needed for synchronizing configuration during
* installation of a module, in which case all configuration being shipped with * installation of a module, in which case all configuration being shipped with
* the module is known to be new. Therefore, the module installation process is * the module is known to be new. Therefore, the module installation process is
* able to short-circuit the full diff against the active store; the diff would * able to short-circuit the full diff against the active configuration; the
* yield all currently available configuration as items to remove, since they do * diff would yield all currently available configuration as items to remove,
* not exist in the module's default configuration directory. * since they do not exist in the module's default configuration directory.
* *
* This also can be used for testing purposes. * This also can be used for testing purposes.
*/ */
......
...@@ -36,7 +36,7 @@ function testCRUD() { ...@@ -36,7 +36,7 @@ function testCRUD() {
$config->save(); $config->save();
$this->assertIdentical($config->isNew(), FALSE); $this->assertIdentical($config->isNew(), FALSE);
// Verify the active store contains the saved value. // Verify the active configuration contains the saved value.
$actual_data = $storage->read($name); $actual_data = $storage->read($name);
$this->assertIdentical($actual_data, array('value' => 'initial')); $this->assertIdentical($actual_data, array('value' => 'initial'));
...@@ -45,7 +45,7 @@ function testCRUD() { ...@@ -45,7 +45,7 @@ function testCRUD() {
$config->save(); $config->save();
$this->assertIdentical($config->isNew(), FALSE); $this->assertIdentical($config->isNew(), FALSE);
// Verify the active store contains the updated value. // Verify the active configuration contains the updated value.
$actual_data = $storage->read($name); $actual_data = $storage->read($name);
$this->assertIdentical($actual_data, array('value' => 'instance-update')); $this->assertIdentical($actual_data, array('value' => 'instance-update'));
...@@ -61,7 +61,7 @@ function testCRUD() { ...@@ -61,7 +61,7 @@ function testCRUD() {
$this->assertIdentical($config->get(), array()); $this->assertIdentical($config->get(), array());
$this->assertIdentical($config->isNew(), TRUE); $this->assertIdentical($config->isNew(), TRUE);
// Verify the active store contains no value. // Verify the active configuration contains no value.
$actual_data = $storage->read($name); $actual_data = $storage->read($name);
$this->assertIdentical($actual_data, FALSE); $this->assertIdentical($actual_data, FALSE);
...@@ -75,7 +75,7 @@ function testCRUD() { ...@@ -75,7 +75,7 @@ function testCRUD() {
$config->save(); $config->save();
$this->assertIdentical($config->isNew(), FALSE); $this->assertIdentical($config->isNew(), FALSE);
// Verify the active store contains the updated value. // Verify the active configuration contains the updated value.
$actual_data = $storage->read($name); $actual_data = $storage->read($name);
$this->assertIdentical($actual_data, array('value' => 're-created')); $this->assertIdentical($actual_data, array('value' => 're-created'));
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
use Drupal\simpletest\WebTestBase; use Drupal\simpletest\WebTestBase;
/** /**
* Tests importing configuration from files into active store. * Tests importing configuration from files into active configuration.
*/ */
class ConfigImportTest extends WebTestBase { class ConfigImportTest extends WebTestBase {
...@@ -24,7 +24,7 @@ class ConfigImportTest extends WebTestBase { ...@@ -24,7 +24,7 @@ class ConfigImportTest extends WebTestBase {
public static function getInfo() { public static function getInfo() {
return array( return array(
'name' => 'Import configuration', 'name' => 'Import configuration',
'description' => 'Tests importing configuration from files into active store.', 'description' => 'Tests importing configuration from files into active configuration.',
'group' => 'Configuration', 'group' => 'Configuration',
); );
} }
...@@ -187,7 +187,7 @@ function testUpdated() { ...@@ -187,7 +187,7 @@ function testUpdated() {
$original_dynamic_data['label'] = 'Updated'; $original_dynamic_data['label'] = 'Updated';
$staging->write($dynamic_name, $original_dynamic_data); $staging->write($dynamic_name, $original_dynamic_data);
// Verify the active store still returns the default values. // Verify the active configuration still returns the default values.
$config = config($name); $config = config($name);
$this->assertIdentical($config->get('foo'), 'bar'); $this->assertIdentical($config->get('foo'), 'bar');
$config = config($dynamic_name); $config = config($dynamic_name);
......
...@@ -25,7 +25,7 @@ function setUp() { ...@@ -25,7 +25,7 @@ function setUp() {
parent::setUp(); parent::setUp();
$schema['config'] = array( $schema['config'] = array(
'description' => 'Default active store for the configuration system.', 'description' => 'Database storage for the configuration system.',
'fields' => array( 'fields' => array(
'name' => array( 'name' => array(
'description' => 'The identifier for the configuration entry, such as module.example (the name of the file, minus the file extension).', 'description' => 'The identifier for the configuration entry, such as module.example (the name of the file, minus the file extension).',
......
...@@ -104,8 +104,8 @@ function assertModuleConfig($module) { ...@@ -104,8 +104,8 @@ function assertModuleConfig($module) {
// Verify that the config directory is not empty. // Verify that the config directory is not empty.
$this->assertTrue($names); $this->assertTrue($names);
// Look up each default configuration object name in the active store, and // Look up each default configuration object name in the active
// if it exists, remove it from the stack. // configuration, and if it exists, remove it from the stack.
foreach ($names as $key => $name) { foreach ($names as $key => $name) {
if (config($name)->get()) { if (config($name)->get()) {
unset($names[$key]); unset($names[$key]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment