From 9a878fb486be4fb6ec5c759016ae3b7db59abdc1 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 11 Apr 2014 09:59:35 -0400
Subject: [PATCH] Issue #2227187 by Mykhailo Gurei, Jalandhar, cs_shadow,
mandar.harkare | Berdir: Stop refering to config storage as storage
controller.
---
core/includes/module.inc | 2 +-
core/lib/Drupal/Core/Config/CachedStorage.php | 6 +++---
core/lib/Drupal/Core/Config/Config.php | 2 +-
core/lib/Drupal/Core/Config/ConfigFactory.php | 4 ++--
core/lib/Drupal/Core/Config/ConfigFactoryInterface.php | 2 +-
core/lib/Drupal/Core/Config/DatabaseStorage.php | 2 +-
.../lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php | 2 +-
core/lib/Drupal/Core/Config/FileStorage.php | 4 ++--
core/lib/Drupal/Core/Config/InstallStorage.php | 2 +-
core/lib/Drupal/Core/Config/NullStorage.php | 2 +-
core/lib/Drupal/Core/Config/StorageCacheInterface.php | 2 +-
core/lib/Drupal/Core/Config/StorageComparer.php | 4 ++--
core/lib/Drupal/Core/Config/StorageComparerInterface.php | 4 ++--
core/lib/Drupal/Core/Config/StorageException.php | 2 +-
core/lib/Drupal/Core/Config/StorageInterface.php | 2 +-
core/lib/Drupal/Core/Config/TypedConfigManager.php | 8 ++++----
.../Drupal/config/Tests/Storage/DatabaseStorageTest.php | 6 +++---
.../lib/Drupal/config/Tests/Storage/FileStorageTest.php | 6 +++---
.../migrate/lib/Drupal/migrate/MigrationStorage.php | 2 +-
.../lib/Drupal/migrate_drupal/MigrationStorage.php | 2 +-
.../Tests/Core/Config/Entity/ConfigEntityStorageTest.php | 2 +-
21 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/core/includes/module.inc b/core/includes/module.inc
index b5d189cc4a29..18de4fcdb585 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -28,7 +28,7 @@
* @todo There are too many layers/levels of caching involved for system_list()
* data. Consider to add a \Drupal::config($name, $cache = TRUE) argument to allow
* callers like system_list() to force-disable a possible configuration
- * storage controller cache or some other way to circumvent it/take it over.
+ * storage cache or some other way to circumvent it/take it over.
*/
function system_list($type) {
$lists = &drupal_static(__FUNCTION__);
diff --git a/core/lib/Drupal/Core/Config/CachedStorage.php b/core/lib/Drupal/Core/Config/CachedStorage.php
index 1ff404629e9e..08dc5828f261 100644
--- a/core/lib/Drupal/Core/Config/CachedStorage.php
+++ b/core/lib/Drupal/Core/Config/CachedStorage.php
@@ -11,7 +11,7 @@
use Drupal\Core\Cache\CacheBackendInterface;
/**
- * Defines the cached storage controller.
+ * Defines the cached storage.
*
* The class gets another storage and a cache backend injected. It reads from
* the cache and delegates the read to the storage on a cache miss. It also
@@ -41,10 +41,10 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
protected $findByPrefixCache = array();
/**
- * Constructs a new CachedStorage controller.
+ * Constructs a new CachedStorage.
*
* @param \Drupal\Core\Config\StorageInterface $storage
- * A configuration storage controller to be cached.
+ * A configuration storage to be cached.
* @param \Drupal\Core\Cache\CacheBackendInterface $cache
* A cache backend instance to use for caching.
*/
diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php
index 19899a567cca..7cbe2eba6ccf 100644
--- a/core/lib/Drupal/Core/Config/Config.php
+++ b/core/lib/Drupal/Core/Config/Config.php
@@ -57,7 +57,7 @@ class Config extends StorableConfigBase {
* @param string $name
* The name of the configuration object being constructed.
* @param \Drupal\Core\Config\StorageInterface $storage
- * A storage controller object to use for reading and writing the
+ * A storage object to use for reading and writing the
* configuration data.
* @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
* An event dispatcher instance to use for configuration events.
diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php
index 0e7826ede7ad..5d3756e25087 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -19,7 +19,7 @@
*
* @see \Drupal\Core\Config\Config
*
- * Each configuration object gets a storage controller object injected, which
+ * Each configuration object gets a storage object injected, which
* is used for reading and writing the configuration data.
*
* @see \Drupal\Core\Config\StorageInterface
@@ -27,7 +27,7 @@
class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface {
/**
- * A storage controller instance for reading and writing configuration data.
+ * A storage instance for reading and writing configuration data.
*
* @var \Drupal\Core\Config\StorageInterface
*/
diff --git a/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
index 639b483914ef..55eb6f6aff02 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
@@ -70,7 +70,7 @@ public function loadMultiple(array $names);
public function reset($name = NULL);
/**
- * Renames a configuration object using the storage controller.
+ * Renames a configuration object using the storage.
*
* @param string $old_name
* The old name of the configuration object.
diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php
index fd8f2ee41464..e1e7faca8180 100644
--- a/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -37,7 +37,7 @@ class DatabaseStorage implements StorageInterface {
protected $options = array();
/**
- * Constructs a new DatabaseStorage controller.
+ * Constructs a new DatabaseStorage.
*
* @param \Drupal\Core\Database\Connection $connection
* A Database connection to use for reading and writing configuration data.
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 2d773dcd44cc..6a1fdb6860d5 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -352,7 +352,7 @@ public function save(EntityInterface $entity) {
if ($id !== $entity->id()) {
// Renaming a config object needs to cater for:
- // - Storage controller needs to access the original object.
+ // - Storage needs to access the original object.
// - The object needs to be renamed/copied in ConfigFactory and reloaded.
// - All instances of the object need to be renamed.
$config = $this->configFactory->rename($prefix . $id, $prefix . $entity->id());
diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php
index 14268e9c62dc..fbb997051a83 100644
--- a/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/core/lib/Drupal/Core/Config/FileStorage.php
@@ -13,7 +13,7 @@
use Symfony\Component\Yaml\Parser;
/**
- * Defines the file storage controller.
+ * Defines the file storage.
*/
class FileStorage implements StorageInterface {
@@ -39,7 +39,7 @@ class FileStorage implements StorageInterface {
protected $parser;
/**
- * Constructs a new FileStorage controller.
+ * Constructs a new FileStorage.
*
* @param string $directory
* A directory path to use for reading and writing of configuration files.
diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php
index cdc1719d4b42..1aa1bec28664 100644
--- a/core/lib/Drupal/Core/Config/InstallStorage.php
+++ b/core/lib/Drupal/Core/Config/InstallStorage.php
@@ -10,7 +10,7 @@
use Drupal\Core\Extension\ExtensionDiscovery;
/**
- * Storage controller used by the Drupal installer.
+ * Storage used by the Drupal installer.
*
* This storage performs a full filesystem scan to discover all available
* extensions and reads from all default config directories that exist.
diff --git a/core/lib/Drupal/Core/Config/NullStorage.php b/core/lib/Drupal/Core/Config/NullStorage.php
index 2bf121d683e5..c66f718fcddc 100644
--- a/core/lib/Drupal/Core/Config/NullStorage.php
+++ b/core/lib/Drupal/Core/Config/NullStorage.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Config;
/**
- * Defines a stub storage controller.
+ * Defines a stub storage.
*
* This storage is always empty; the controller reads and writes nothing.
*
diff --git a/core/lib/Drupal/Core/Config/StorageCacheInterface.php b/core/lib/Drupal/Core/Config/StorageCacheInterface.php
index 8d864bbbf53f..674547fd30f5 100644
--- a/core/lib/Drupal/Core/Config/StorageCacheInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageCacheInterface.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Config;
/**
- * Defines an interface for cached configuration storage controllers.
+ * Defines an interface for cached configuration storage.
*/
interface StorageCacheInterface {
diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
index ee467b6be812..b30db17405ec 100644
--- a/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -68,9 +68,9 @@ class StorageComparer implements StorageComparerInterface {
* Constructs the Configuration storage comparer.
*
* @param \Drupal\Core\Config\StorageInterface $source_storage
- * Storage controller object used to read configuration.
+ * Storage object used to read configuration.
* @param \Drupal\Core\Config\StorageInterface $target_storage
- * Storage controller object used to write configuration.
+ * Storage object used to write configuration.
*/
public function __construct(StorageInterface $source_storage, StorageInterface $target_storage) {
$this->sourceStorage = $source_storage;
diff --git a/core/lib/Drupal/Core/Config/StorageComparerInterface.php b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
index 3c6c66611809..e8c597d7897d 100644
--- a/core/lib/Drupal/Core/Config/StorageComparerInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
@@ -16,7 +16,7 @@ interface StorageComparerInterface {
* Gets the configuration source storage.
*
* @return \Drupal\Core\Config\StorageInterface
- * Storage controller object used to read configuration.
+ * Storage object used to read configuration.
*/
public function getSourceStorage();
@@ -24,7 +24,7 @@ public function getSourceStorage();
* Gets the configuration target storage.
*
* @return \Drupal\Core\Config\StorageInterface
- * Storage controller object used to write configuration.
+ * Storage object used to write configuration.
*/
public function getTargetStorage();
diff --git a/core/lib/Drupal/Core/Config/StorageException.php b/core/lib/Drupal/Core/Config/StorageException.php
index b1e99a1b9f11..a317d8b0672b 100644
--- a/core/lib/Drupal/Core/Config/StorageException.php
+++ b/core/lib/Drupal/Core/Config/StorageException.php
@@ -8,6 +8,6 @@
namespace Drupal\Core\Config;
/**
- * An exception thrown in case of storage controller operation errors.
+ * An exception thrown in case of storage operation errors.
*/
class StorageException extends ConfigException {}
diff --git a/core/lib/Drupal/Core/Config/StorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php
index 9b45fa80ff1a..35cdf8aab994 100644
--- a/core/lib/Drupal/Core/Config/StorageInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageInterface.php
@@ -8,7 +8,7 @@
namespace Drupal\Core\Config;
/**
- * Defines an interface for configuration storage controllers.
+ * Defines an interface for configuration storage.
*
* Classes implementing this interface allow reading and writing configuration
* data from and to the storage.
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManager.php b/core/lib/Drupal/Core/Config/TypedConfigManager.php
index 011be4d7e24b..07b0384b3616 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -26,14 +26,14 @@ class TypedConfigManager extends PluginManagerBase implements TypedConfigManager
const CACHE_ID = 'typed_config_definitions';
/**
- * A storage controller instance for reading configuration data.
+ * A storage instance for reading configuration data.
*
* @var \Drupal\Core\Config\StorageInterface
*/
protected $configStorage;
/**
- * A storage controller instance for reading configuration schema data.
+ * A storage instance for reading configuration schema data.
*
* @var \Drupal\Core\Config\StorageInterface
*/
@@ -57,9 +57,9 @@ class TypedConfigManager extends PluginManagerBase implements TypedConfigManager
* Creates a new typed configuration manager.
*
* @param \Drupal\Core\Config\StorageInterface $configStorage
- * The storage controller object to use for reading schema data
+ * The storage object to use for reading schema data
* @param \Drupal\Core\Config\StorageInterface $schemaStorage
- * The storage controller object to use for reading schema data
+ * The storage object to use for reading schema data
* @param \Drupal\Core\Cache\CacheBackendInterface $cache
* The cache backend to use for caching the definitions.
*/
diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php b/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
index 516bb9d756d9..66cdb995d7d7 100644
--- a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
@@ -10,13 +10,13 @@
use Drupal\Core\Config\DatabaseStorage;
/**
- * Tests DatabaseStorage controller operations.
+ * Tests DatabaseStorage operations.
*/
class DatabaseStorageTest extends ConfigStorageTestBase {
public static function getInfo() {
return array(
- 'name' => 'DatabaseStorage controller operations',
- 'description' => 'Tests DatabaseStorage controller operations.',
+ 'name' => 'DatabaseStorage operations',
+ 'description' => 'Tests DatabaseStorage operations.',
'group' => 'Configuration',
);
}
diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php b/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php
index d430bd388d46..dd6c4009d122 100644
--- a/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php
@@ -11,13 +11,13 @@
use Symfony\Component\Yaml\Yaml;
/**
- * Tests FileStorage controller operations.
+ * Tests FileStorage operations.
*/
class FileStorageTest extends ConfigStorageTestBase {
public static function getInfo() {
return array(
- 'name' => 'FileStorage controller operations',
- 'description' => 'Tests FileStorage controller operations.',
+ 'name' => 'FileStorage operations',
+ 'description' => 'Tests FileStorage operations.',
'group' => 'Configuration',
);
}
diff --git a/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php b/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php
index 73a5f07615a3..30c63fee7669 100644
--- a/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php
+++ b/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php
@@ -11,7 +11,7 @@
use Drupal\Core\Config\Entity\ConfigEntityStorage;
/**
- * Storage controller for migration entities.
+ * Storage for migration entities.
*/
class MigrationStorage extends ConfigEntityStorage implements MigrateBuildDependencyInterface {
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php
index 5e65cf1fcdb0..28afe631465a 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php
@@ -13,7 +13,7 @@
use Drupal\migrate\MigrationStorage as BaseMigrationStorage;
/**
- * Storage controller for migration entities.
+ * Storage for migration entities.
*/
class MigrationStorage extends BaseMigrationStorage {
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index d6f5c9c6efe9..10ba1a6cab7f 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -49,7 +49,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
protected $languageManager;
/**
- * The config storage controller.
+ * The config storage.
*
* @var \Drupal\Core\Config\Entity\ConfigEntityStorage
*/
--
GitLab