diff --git a/core/includes/config.inc b/core/includes/config.inc index 5e6fa00..6193269 100644 --- a/core/includes/config.inc +++ b/core/includes/config.inc @@ -1,6 +1,6 @@ write(file_get_contents($module_config_dir . '/' . $file)); + $storage = new DatabaseStorage($config_name); + $storage->write(file_get_contents($module_config_dir . '/' . $file)); } } } @@ -88,8 +88,8 @@ function config_get_files_with_prefix($prefix = '') { * @return * @todo */ -function config_get_verified_storage_names_with_prefix($prefix = '') { - return DrupalVerifiedStorageSQL::getNamesWithPrefix($prefix); +function config_get_storage_names_with_prefix($prefix = '') { + return DatabaseStorage::getNamesWithPrefix($prefix); } /** @@ -114,7 +114,7 @@ function config_get_verified_storage_names_with_prefix($prefix = '') { * alternate storage engines.. */ function config($name, $class = 'Drupal\Core\Config\DrupalConfig') { - return new $class(new DrupalVerifiedStorageSQL($name)); + return new $class(new DatabaseStorage($name)); } /** diff --git a/core/lib/Drupal/Core/Config/DrupalConfigVerifiedStorage.php b/core/lib/Drupal/Core/Config/AbstractStorage.php similarity index 68% rename from core/lib/Drupal/Core/Config/DrupalConfigVerifiedStorage.php rename to core/lib/Drupal/Core/Config/AbstractStorage.php index 56cd16d..534f6a8 100644 --- a/core/lib/Drupal/Core/Config/DrupalConfigVerifiedStorage.php +++ b/core/lib/Drupal/Core/Config/AbstractStorage.php @@ -2,13 +2,13 @@ namespace Drupal\Core\Config; -use Drupal\Core\Config\DrupalConfigVerifiedStorageInterface; +use Drupal\Core\Config\StorageInterface; use Drupal\Core\Config\FileStorage; /** * @todo */ -abstract class DrupalConfigVerifiedStorage implements DrupalConfigVerifiedStorageInterface { +abstract class AbstractStorage implements StorageInterface { protected $name; @@ -20,7 +20,7 @@ abstract class DrupalConfigVerifiedStorage implements DrupalConfigVerifiedStorag protected $fileStorage; /** - * Implements DrupalConfigVerifiedStorageInterface::__construct(). + * Implements StorageInterface::__construct(). */ function __construct($name) { $this->name = $name; @@ -40,21 +40,21 @@ abstract class DrupalConfigVerifiedStorage implements DrupalConfigVerifiedStorag } /** - * Implements DrupalConfigVerifiedStorageInterface::copyToFile(). + * Implements StorageInterface::copyToFile(). */ public function copyToFile() { return $this->writeToFile($this->read()); } /** - * Implements DrupalConfigVerifiedStorageInterface::deleteFile(). + * Implements StorageInterface::deleteFile(). */ public function deleteFile() { return $this->fileStorage()->delete(); } /** - * Implements DrupalConfigVerifiedStorageInterface::copyFromFile(). + * Implements StorageInterface::copyFromFile(). */ public function copyFromFile() { return $this->writeToActive($this->readFromFile()); @@ -71,14 +71,14 @@ abstract class DrupalConfigVerifiedStorage implements DrupalConfigVerifiedStorag } /** - * Implements DrupalConfigVerifiedStorageInterface::isOutOfSync(). + * Implements StorageInterface::isOutOfSync(). */ public function isOutOfSync() { return $this->read() !== $this->readFromFile(); } /** - * Implements DrupalConfigVerifiedStorageInterface::write(). + * Implements StorageInterface::write(). */ public function write($data) { $this->writeToActive($data); @@ -86,14 +86,14 @@ abstract class DrupalConfigVerifiedStorage implements DrupalConfigVerifiedStorag } /** - * Implements DrupalConfigVerifiedStorageInterface::writeToFile(). + * Implements StorageInterface::writeToFile(). */ public function writeToFile($data) { return $this->fileStorage()->write($data); } /** - * Implements DrupalConfigVerifiedStorageInterface::delete(). + * Implements StorageInterface::delete(). */ public function delete() { $this->deleteFromActive(); @@ -101,7 +101,7 @@ abstract class DrupalConfigVerifiedStorage implements DrupalConfigVerifiedStorag } /** - * Implements DrupalConfigVerifiedStorageInterface::getName(). + * Implements StorageInterface::getName(). */ public function getName() { return $this->name; diff --git a/core/lib/Drupal/Core/Config/DrupalVerifiedStorageSQL.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php similarity index 78% rename from core/lib/Drupal/Core/Config/DrupalVerifiedStorageSQL.php rename to core/lib/Drupal/Core/Config/DatabaseStorage.php index 97d499a..dd8cb48 100644 --- a/core/lib/Drupal/Core/Config/DrupalVerifiedStorageSQL.php +++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php @@ -2,16 +2,16 @@ namespace Drupal\Core\Config; -use Drupal\Core\Config\DrupalConfigVerifiedStorage; +use Drupal\Core\Config\AbstractStorage; use Exception; /** * Represents an SQL-based configuration storage object. */ -class DrupalVerifiedStorageSQL extends DrupalConfigVerifiedStorage { +class DatabaseStorage extends AbstractStorage { /** - * Overrides DrupalConfigVerifiedStorage::read(). + * Overrides AbstractStorage::read(). */ public function read() { // There are situations, like in the installer, where we may attempt a @@ -26,7 +26,7 @@ class DrupalVerifiedStorageSQL extends DrupalConfigVerifiedStorage { } /** - * Implements DrupalConfigVerifiedStorageInterface::writeToActive(). + * Implements StorageInterface::writeToActive(). */ public function writeToActive($data) { return db_merge('config') @@ -45,7 +45,7 @@ class DrupalVerifiedStorageSQL extends DrupalConfigVerifiedStorage { } /** - * Implements DrupalConfigVerifiedStorageInterface::getNamesWithPrefix(). + * Implements StorageInterface::getNamesWithPrefix(). */ static public function getNamesWithPrefix($prefix = '') { return db_query('SELECT name FROM {config} WHERE name LIKE :name', array(':name' => db_like($prefix) . '%'))->fetchCol(); diff --git a/core/lib/Drupal/Core/Config/DrupalConfig.php b/core/lib/Drupal/Core/Config/DrupalConfig.php index 9fc33aa..c405757 100644 --- a/core/lib/Drupal/Core/Config/DrupalConfig.php +++ b/core/lib/Drupal/Core/Config/DrupalConfig.php @@ -2,7 +2,7 @@ namespace Drupal\Core\Config; -use Drupal\Core\Config\DrupalConfigVerifiedStorageInterface; +use Drupal\Core\Config\StorageInterface; use Drupal\Core\Config\ConfigException; /** @@ -13,22 +13,22 @@ class DrupalConfig { /** * The storage engine to save this config object to. * - * @var DrupalConfigVerifiedStorageInterface + * @var StorageInterface */ - protected $_verifiedStorage; + protected $storage; protected $data = array(); /** * Constructs a DrupalConfig object. * - * @param DrupalConfigVerifiedStorageInterface $verified_storage + * @param StorageInterface $storage * The storage engine where this config object should be saved. * * @todo $this should really know about $name and make it publicly accessible. */ - public function __construct(DrupalConfigVerifiedStorageInterface $verified_storage) { - $this->_verifiedStorage = $verified_storage; + public function __construct(StorageInterface $storage) { + $this->storage = $storage; $this->read(); } @@ -36,7 +36,7 @@ class DrupalConfig { * Reads config data from the active store into our object. */ public function read() { - $active = (array) config_decode($this->_verifiedStorage->read()); + $active = (array) config_decode($this->storage->read()); foreach ($active as $key => $value) { // If the setting is empty, return an empty string rather than an array. // This is necessary because SimpleXML's default behavior is to return @@ -89,7 +89,7 @@ class DrupalConfig { public function get($key = '') { global $conf; - $name = $this->_verifiedStorage->getName(); + $name = $this->storage->getName(); if (isset($conf[$name])) { $merged_data = drupal_array_merge_deep($this->data, $conf[$name]); } @@ -201,7 +201,7 @@ class DrupalConfig { * Saves the configuration object to disk as XML. */ public function save() { - $this->_verifiedStorage->write(config_encode($this->data)); + $this->storage->write(config_encode($this->data)); } /** @@ -209,6 +209,6 @@ class DrupalConfig { */ public function delete() { $this->data = array(); - $this->_verifiedStorage->delete(); + $this->storage->delete(); } } diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php index 77b8db5..e65e168 100644 --- a/core/lib/Drupal/Core/Config/FileStorage.php +++ b/core/lib/Drupal/Core/Config/FileStorage.php @@ -32,7 +32,7 @@ class FileStorage { protected function readData() { $data = file_get_contents($this->getFilePath()); if ($data === FALSE) { - throw new \Exception('Read file is invalid.'); + throw new FileStorageReadException('Read file is invalid.'); } return $data; } @@ -68,7 +68,7 @@ class FileStorage { */ public function write($data) { if (!file_put_contents($this->getFilePath(), $data)) { - throw new \Exception('Failed to write configuration file: ' . $this->getFilePath()); + throw new FileStorageException('Failed to write configuration file: ' . $this->getFilePath()); } } diff --git a/core/lib/Drupal/Core/Config/ConfigFileStorageException.php b/core/lib/Drupal/Core/Config/FileStorageException.php similarity index 61% rename from core/lib/Drupal/Core/Config/ConfigFileStorageException.php rename to core/lib/Drupal/Core/Config/FileStorageException.php index ce7fb30..bf3ae5f 100644 --- a/core/lib/Drupal/Core/Config/ConfigFileStorageException.php +++ b/core/lib/Drupal/Core/Config/FileStorageException.php @@ -7,4 +7,4 @@ use Drupal\Core\Config\ConfigException; /** * @todo */ -class ConfigFileStorageException extends ConfigException {} +class FileStorageException extends ConfigException {} diff --git a/core/lib/Drupal/Core/Config/ConfigFileStorageReadException.php b/core/lib/Drupal/Core/Config/FileStorageReadException.php similarity index 30% rename from core/lib/Drupal/Core/Config/ConfigFileStorageReadException.php rename to core/lib/Drupal/Core/Config/FileStorageReadException.php index a3ac95c..d613666 100644 --- a/core/lib/Drupal/Core/Config/ConfigFileStorageReadException.php +++ b/core/lib/Drupal/Core/Config/FileStorageReadException.php @@ -2,9 +2,9 @@ namespace Drupal\Core\Config; -use Drupal\Core\Config\ConfigFileStorageException; +use Drupal\Core\Config\FileStorageException; /** * @todo */ -class ConfigFileStorageReadException extends ConfigFileStorageException {} +class FileStorageReadException extends FileStorageException {} diff --git a/core/lib/Drupal/Core/Config/DrupalConfigVerifiedStorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php similarity index 69% rename from core/lib/Drupal/Core/Config/DrupalConfigVerifiedStorageInterface.php rename to core/lib/Drupal/Core/Config/StorageInterface.php index 8048e35..f1e8a3d 100644 --- a/core/lib/Drupal/Core/Config/DrupalConfigVerifiedStorageInterface.php +++ b/core/lib/Drupal/Core/Config/StorageInterface.php @@ -3,15 +3,15 @@ namespace Drupal\Core\Config; /** - * Defines an interface for verified storage manipulation. + * Defines an interface for configuration storage manipulation. * * This class allows reading and writing configuration data from/to the - * verified storage and copying to/from the file storing the same data. + * storage and copying to/from the file storing the same data. */ -interface DrupalConfigVerifiedStorageInterface { +interface StorageInterface { /** - * Constructs a verified storage manipulation class. + * Constructs a storage manipulation class. * * @param $name * Lowercase string, the name for the configuration data. @@ -19,17 +19,17 @@ interface DrupalConfigVerifiedStorageInterface { function __construct($name); /** - * Reads the configuration data from the verified storage. + * Reads the configuration data from the storage. */ function read(); /** - * Copies the configuration data from the verified storage into a file. + * Copies the configuration data from the storage into a file. */ function copyToFile(); /** - * Copies the configuration data from the file into the verified storage. + * Copies the configuration data from the file into the storage. */ function copyFromFile(); @@ -39,10 +39,10 @@ interface DrupalConfigVerifiedStorageInterface { function deleteFile(); /** - * Checks whether the file and the verified storage is in sync. + * Checks whether the file and the storage is in sync. * * @return - * TRUE if the file and the verified storage contains the same data, FALSE + * TRUE if the file and the storage contains the same data, FALSE * if not. */ function isOutOfSync(); diff --git a/core/modules/image/image.module b/core/modules/image/image.module index 8fd8cee..3edf83c 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -516,7 +516,7 @@ function image_styles() { $styles = array(); // Select the styles we have configured. - $configured_styles = config_get_verified_storage_names_with_prefix('image.style'); + $configured_styles = config_get_storage_names_with_prefix('image.style'); foreach ($configured_styles as $config_name) { // @todo Allow to retrieve the name without prefix only. $style = image_style_load(str_replace('image.style.', '', $config_name));