diff --git a/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php b/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php index 39f4348..3873691 100644 --- a/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php +++ b/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php @@ -8,7 +8,7 @@ namespace Drupal\Core\Config; /** - * Storage controller to access configuration and schema in enabled extensions. + * Storage to access configuration and schema in enabled extensions. * * @see \Drupal\Core\Config\ConfigInstaller * @see \Drupal\Core\Config\TypedConfigManager @@ -28,13 +28,13 @@ class ExtensionInstallStorage extends InstallStorage { * @param \Drupal\Core\Config\StorageInterface $config_storage * The active configuration store where the list of enabled modules and * themes is stored. - * @param string $collection + * @param string $directory * The folder to scan in each extension to scan for files. Defaults to * 'config'. */ - public function __construct(StorageInterface $config_storage, $collection = 'config') { + public function __construct(StorageInterface $config_storage, $directory = 'config') { $this->configStorage = $config_storage; - $this->collection = $collection; + $this->directory = $directory; } /** diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php index da9e57d..ff3005a 100644 --- a/core/lib/Drupal/Core/Config/InstallStorage.php +++ b/core/lib/Drupal/Core/Config/InstallStorage.php @@ -34,17 +34,17 @@ class InstallStorage extends FileStorage { * * @var string */ - protected $collection; + protected $directory; /** - * Overrides Drupal\Core\Config\FileStorage::__construct(). + * Constructs an InstallStorage object. * - * @param string $collection + * @param string $directory * The folder to scan in each extension to scan for files. Defaults to * 'config'. */ - public function __construct($collection = 'config') { - $this->collection = $collection; + public function __construct($directory = 'config') { + $this->directory = $directory; } /** @@ -77,7 +77,7 @@ public function getFilePath($name) { } /** - * Implements \Drupal\Core\Config\StorageInterface::exists(). + * {@inheritdoc} */ public function exists($name) { return array_key_exists($name, $this->getAllFolders()); @@ -188,7 +188,7 @@ public function getComponentNames($type, array $list) { * The configuration folder name for this component. */ protected function getComponentFolder($type, $name) { - return drupal_get_path($type, $name) . '/' . $this->collection; + return drupal_get_path($type, $name) . '/' . $this->directory; } /**