diff --git a/core/lib/Drupal/Core/Config/CachedStorage.php b/core/lib/Drupal/Core/Config/CachedStorage.php index 1ff4046..08dc582 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 19899a5..7cbe2eb 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 0e7826e..5d3756e 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 639b483..55eb6f6 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/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php index 090b883..d0f0ace 100644 --- a/core/lib/Drupal/Core/Config/ConfigImporter.php +++ b/core/lib/Drupal/Core/Config/ConfigImporter.php @@ -283,7 +283,7 @@ protected function importConfig($op, $name) { } /** - * Invokes import* methods on configuration entity storage controllers. + * Invokes import* methods on configuration entity storage. * * Allow modules to take over configuration change operations for higher-level * configuration data. @@ -321,7 +321,7 @@ protected function importInvokeOwner($op, $name) { $method = 'import' . ucfirst($op); $entity_storage = $this->configManager->getEntityManager()->getStorageController($entity_type); - // Call to the configuration entity's storage controller to handle the + // Call to the configuration entity's storage to handle the // configuration change. if (!($entity_storage instanceof ImportableEntityStorageInterface)) { throw new EntityStorageException(String::format('The entity storage "@storage" for the "@entity_type" entity type does not support imports', array('@storage' => get_class($entity_storage), '@entity_type' => $entity_type))); diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php index c43145a..e1e7fac 100644 --- a/core/lib/Drupal/Core/Config/DatabaseStorage.php +++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php @@ -11,7 +11,7 @@ use Drupal\Core\Database\Connection; /** - * Defines the Database storage controller. + * Defines the Database storage. */ class DatabaseStorage implements StorageInterface { @@ -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/ExtensionInstallStorage.php b/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php index 60f4188..15d8469 100644 --- a/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php +++ b/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php @@ -11,7 +11,7 @@ use Drupal\Core\Config\StorageException; /** - * Defines the file storage controller for metadata files. + * Defines the file storage for metadata files. */ class ExtensionInstallStorage extends InstallStorage { diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php index 14268e9..fbb9970 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 eba7541..47bad78 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 2bf121d..c66f718 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 8d864bb..674547f 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 02cd64f..1b3db39 100644 --- a/core/lib/Drupal/Core/Config/StorageComparer.php +++ b/core/lib/Drupal/Core/Config/StorageComparer.php @@ -66,9 +66,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 3c6c666..e8c597d 100644 --- a/core/lib/Drupal/Core/Config/StorageComparerInterface.php +++ b/core/lib/Drupal/Core/Config/StorageComparerInterface.php @@ -16,7 +16,7 @@ * 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 b1e99a1..a317d8b 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 9b45fa8..35cdf8a 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 011be4d..07b0384 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. */