Commit 9a878fb4 authored by alexpott's avatar alexpott

Issue #2227187 by Mykhailo Gurei, Jalandhar, cs_shadow, mandar.harkare |...

Issue #2227187 by Mykhailo Gurei, Jalandhar, cs_shadow, mandar.harkare | Berdir: Stop refering to config storage as storage controller.
parent 2cc71a6b
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* @todo There are too many layers/levels of caching involved for system_list() * @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 * data. Consider to add a \Drupal::config($name, $cache = TRUE) argument to allow
* callers like system_list() to force-disable a possible configuration * 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) { function system_list($type) {
$lists = &drupal_static(__FUNCTION__); $lists = &drupal_static(__FUNCTION__);
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
use Drupal\Core\Cache\CacheBackendInterface; 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 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 * the cache and delegates the read to the storage on a cache miss. It also
...@@ -41,10 +41,10 @@ class CachedStorage implements StorageInterface, StorageCacheInterface { ...@@ -41,10 +41,10 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
protected $findByPrefixCache = array(); protected $findByPrefixCache = array();
/** /**
* Constructs a new CachedStorage controller. * Constructs a new CachedStorage.
* *
* @param \Drupal\Core\Config\StorageInterface $storage * @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 * @param \Drupal\Core\Cache\CacheBackendInterface $cache
* A cache backend instance to use for caching. * A cache backend instance to use for caching.
*/ */
......
...@@ -57,7 +57,7 @@ class Config extends StorableConfigBase { ...@@ -57,7 +57,7 @@ class Config extends StorableConfigBase {
* @param string $name * @param string $name
* The name of the configuration object being constructed. * The name of the configuration object being constructed.
* @param \Drupal\Core\Config\StorageInterface $storage * @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. * configuration data.
* @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
* An event dispatcher instance to use for configuration events. * An event dispatcher instance to use for configuration events.
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* *
* @see \Drupal\Core\Config\Config * @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. * is used for reading and writing the configuration data.
* *
* @see \Drupal\Core\Config\StorageInterface * @see \Drupal\Core\Config\StorageInterface
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface { 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 * @var \Drupal\Core\Config\StorageInterface
*/ */
......
...@@ -70,7 +70,7 @@ public function loadMultiple(array $names); ...@@ -70,7 +70,7 @@ public function loadMultiple(array $names);
public function reset($name = NULL); public function reset($name = NULL);
/** /**
* Renames a configuration object using the storage controller. * Renames a configuration object using the storage.
* *
* @param string $old_name * @param string $old_name
* The old name of the configuration object. * The old name of the configuration object.
......
...@@ -37,7 +37,7 @@ class DatabaseStorage implements StorageInterface { ...@@ -37,7 +37,7 @@ class DatabaseStorage implements StorageInterface {
protected $options = array(); protected $options = array();
/** /**
* Constructs a new DatabaseStorage controller. * Constructs a new DatabaseStorage.
* *
* @param \Drupal\Core\Database\Connection $connection * @param \Drupal\Core\Database\Connection $connection
* A Database connection to use for reading and writing configuration data. * A Database connection to use for reading and writing configuration data.
......
...@@ -352,7 +352,7 @@ public function save(EntityInterface $entity) { ...@@ -352,7 +352,7 @@ public function save(EntityInterface $entity) {
if ($id !== $entity->id()) { if ($id !== $entity->id()) {
// Renaming a config object needs to cater for: // 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. // - The object needs to be renamed/copied in ConfigFactory and reloaded.
// - All instances of the object need to be renamed. // - All instances of the object need to be renamed.
$config = $this->configFactory->rename($prefix . $id, $prefix . $entity->id()); $config = $this->configFactory->rename($prefix . $id, $prefix . $entity->id());
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
use Symfony\Component\Yaml\Parser; use Symfony\Component\Yaml\Parser;
/** /**
* Defines the file storage controller. * Defines the file storage.
*/ */
class FileStorage implements StorageInterface { class FileStorage implements StorageInterface {
...@@ -39,7 +39,7 @@ class FileStorage implements StorageInterface { ...@@ -39,7 +39,7 @@ class FileStorage implements StorageInterface {
protected $parser; protected $parser;
/** /**
* Constructs a new FileStorage controller. * Constructs a new FileStorage.
* *
* @param string $directory * @param string $directory
* A directory path to use for reading and writing of configuration files. * A directory path to use for reading and writing of configuration files.
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
use Drupal\Core\Extension\ExtensionDiscovery; 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 * This storage performs a full filesystem scan to discover all available
* extensions and reads from all default config directories that exist. * extensions and reads from all default config directories that exist.
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace Drupal\Core\Config; namespace Drupal\Core\Config;
/** /**
* Defines a stub storage controller. * Defines a stub storage.
* *
* This storage is always empty; the controller reads and writes nothing. * This storage is always empty; the controller reads and writes nothing.
* *
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace Drupal\Core\Config; namespace Drupal\Core\Config;
/** /**
* Defines an interface for cached configuration storage controllers. * Defines an interface for cached configuration storage.
*/ */
interface StorageCacheInterface { interface StorageCacheInterface {
......
...@@ -68,9 +68,9 @@ class StorageComparer implements StorageComparerInterface { ...@@ -68,9 +68,9 @@ class StorageComparer implements StorageComparerInterface {
* Constructs the Configuration storage comparer. * Constructs the Configuration storage comparer.
* *
* @param \Drupal\Core\Config\StorageInterface $source_storage * @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 * @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) { public function __construct(StorageInterface $source_storage, StorageInterface $target_storage) {
$this->sourceStorage = $source_storage; $this->sourceStorage = $source_storage;
......
...@@ -16,7 +16,7 @@ interface StorageComparerInterface { ...@@ -16,7 +16,7 @@ interface StorageComparerInterface {
* Gets the configuration source storage. * Gets the configuration source storage.
* *
* @return \Drupal\Core\Config\StorageInterface * @return \Drupal\Core\Config\StorageInterface
* Storage controller object used to read configuration. * Storage object used to read configuration.
*/ */
public function getSourceStorage(); public function getSourceStorage();
...@@ -24,7 +24,7 @@ public function getSourceStorage(); ...@@ -24,7 +24,7 @@ public function getSourceStorage();
* Gets the configuration target storage. * Gets the configuration target storage.
* *
* @return \Drupal\Core\Config\StorageInterface * @return \Drupal\Core\Config\StorageInterface
* Storage controller object used to write configuration. * Storage object used to write configuration.
*/ */
public function getTargetStorage(); public function getTargetStorage();
......
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
namespace Drupal\Core\Config; 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 {} class StorageException extends ConfigException {}
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace Drupal\Core\Config; 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 * Classes implementing this interface allow reading and writing configuration
* data from and to the storage. * data from and to the storage.
......
...@@ -26,14 +26,14 @@ class TypedConfigManager extends PluginManagerBase implements TypedConfigManager ...@@ -26,14 +26,14 @@ class TypedConfigManager extends PluginManagerBase implements TypedConfigManager
const CACHE_ID = 'typed_config_definitions'; 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 * @var \Drupal\Core\Config\StorageInterface
*/ */
protected $configStorage; protected $configStorage;
/** /**
* A storage controller instance for reading configuration schema data. * A storage instance for reading configuration schema data.
* *
* @var \Drupal\Core\Config\StorageInterface * @var \Drupal\Core\Config\StorageInterface
*/ */
...@@ -57,9 +57,9 @@ class TypedConfigManager extends PluginManagerBase implements TypedConfigManager ...@@ -57,9 +57,9 @@ class TypedConfigManager extends PluginManagerBase implements TypedConfigManager
* Creates a new typed configuration manager. * Creates a new typed configuration manager.
* *
* @param \Drupal\Core\Config\StorageInterface $configStorage * @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 * @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 * @param \Drupal\Core\Cache\CacheBackendInterface $cache
* The cache backend to use for caching the definitions. * The cache backend to use for caching the definitions.
*/ */
......
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
use Drupal\Core\Config\DatabaseStorage; use Drupal\Core\Config\DatabaseStorage;
/** /**
* Tests DatabaseStorage controller operations. * Tests DatabaseStorage operations.
*/ */
class DatabaseStorageTest extends ConfigStorageTestBase { class DatabaseStorageTest extends ConfigStorageTestBase {
public static function getInfo() { public static function getInfo() {
return array( return array(
'name' => 'DatabaseStorage controller operations', 'name' => 'DatabaseStorage operations',
'description' => 'Tests DatabaseStorage controller operations.', 'description' => 'Tests DatabaseStorage operations.',
'group' => 'Configuration', 'group' => 'Configuration',
); );
} }
......
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
use Symfony\Component\Yaml\Yaml; use Symfony\Component\Yaml\Yaml;
/** /**
* Tests FileStorage controller operations. * Tests FileStorage operations.
*/ */
class FileStorageTest extends ConfigStorageTestBase { class FileStorageTest extends ConfigStorageTestBase {
public static function getInfo() { public static function getInfo() {
return array( return array(
'name' => 'FileStorage controller operations', 'name' => 'FileStorage operations',
'description' => 'Tests FileStorage controller operations.', 'description' => 'Tests FileStorage operations.',
'group' => 'Configuration', 'group' => 'Configuration',
); );
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
use Drupal\Core\Config\Entity\ConfigEntityStorage; use Drupal\Core\Config\Entity\ConfigEntityStorage;
/** /**
* Storage controller for migration entities. * Storage for migration entities.
*/ */
class MigrationStorage extends ConfigEntityStorage implements MigrateBuildDependencyInterface { class MigrationStorage extends ConfigEntityStorage implements MigrateBuildDependencyInterface {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
use Drupal\migrate\MigrationStorage as BaseMigrationStorage; use Drupal\migrate\MigrationStorage as BaseMigrationStorage;
/** /**
* Storage controller for migration entities. * Storage for migration entities.
*/ */
class MigrationStorage extends BaseMigrationStorage { class MigrationStorage extends BaseMigrationStorage {
......
...@@ -49,7 +49,7 @@ class ConfigEntityStorageTest extends UnitTestCase { ...@@ -49,7 +49,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
protected $languageManager; protected $languageManager;
/** /**
* The config storage controller. * The config storage.
* *
* @var \Drupal\Core\Config\Entity\ConfigEntityStorage * @var \Drupal\Core\Config\Entity\ConfigEntityStorage
*/ */
......
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