diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 2940049..8da3c6f 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2413,47 +2413,51 @@ function drupal_get_bootstrap_phase() { * * @see Drupal\Core\DrupalKernel * - * @param $reset - * A new container instance to reset the Drupal container to. + * @param Symfony\Component\DependencyInjection\Container $new_container + * A new container instance to replace the current. + * @param bool $rebuild + * (optional) Internal use only. Whether to build a new minimal container. * * @return Symfony\Component\DependencyInjection\Container * The instance of the Container used to set up and maintain object * instances. */ -function drupal_container(Container $reset = NULL) { +function drupal_container(Container $new_container = NULL, $rebuild = FALSE) { // We do not use drupal_static() here because we do not have a mechanism by // which to reinitialize the stored objects, so a drupal_static_reset() call // would leave Drupal in a nonfunctional state. static $container = NULL; - if (isset($reset)) { - $container = $reset; + if (isset($new_container) || $rebuild) { + $container = $rebuild ? NULL : $new_container; } - elseif (!isset($container)) { + if (!isset($container)) { // Return a ContainerBuilder instance with the bare essentials needed for any // full bootstrap regardless of whether there will be a DrupalKernel involved. // This will get merged with the full Kernel-built Container on normal page // requests. $container = new ContainerBuilder(); - // Register configuration storage class and options. - // @todo The active store and its options need to be configurable. - // Use either global $conf (recursion warning) or global $config, or a - // bootstrap configuration *file* to allow to set/override this very - // lowest of low level configuration. - $container->setParameter('config.storage.options', array( - 'connection' => 'default', - 'target' => 'default', - )); - $container->register('config.storage', 'Drupal\Core\Config\DatabaseStorage') - ->addArgument('%config.storage.options%'); + $container->register('config.storage.active', 'Drupal\Core\Config\FileStorage') + ->addArgument(config_get_config_directory()); + $container->register('config.storage.staging', 'Drupal\Core\Config\FileStorage') + ->addArgument(config_get_config_directory(CONFIG_STAGING_DIRECTORY)); + $container->register('config.cache') + ->setFactoryClass('Drupal\Core\Cache\CacheFactory') + ->setFactoryMethod('get') + ->addArgument('config'); + $container->register('config.storage', 'Drupal\Core\Config\CachedStorage') + ->addArgument(new Reference('config.storage.active')) + ->addArgument(new Reference('config.cache')); $container->register('config.subscriber.globalconf', 'Drupal\Core\EventSubscriber\ConfigGlobalOverrideSubscriber'); $container->register('dispatcher', 'Symfony\Component\EventDispatcher\EventDispatcher') ->addMethodCall('addSubscriber', array(new Reference('config.subscriber.globalconf'))); + // Register configuration object factory. $container->register('config.factory', 'Drupal\Core\Config\ConfigFactory') - ->addArgument(new Reference('config.storage')) + ->addArgument(new Reference('config.storage.active')) ->addArgument(new Reference('dispatcher')); + } return $container; } diff --git a/core/includes/cache.inc b/core/includes/cache.inc index 73bb05f..ce53930 100644 --- a/core/includes/cache.inc +++ b/core/includes/cache.inc @@ -1,5 +1,7 @@ $config_dir)); + $source_storage = new FileStorage($config_dir); $target_storage = drupal_container()->get('config.storage'); $null_storage = new NullStorage(); @@ -43,7 +40,9 @@ function config_install_default_config($type, $name) { } /** - * @todo Modules need a way to access the active store, whatever it is. + * Gets configuration object names starting with a given prefix. + * + * @see Drupal\Core\Config\StorageInterface::listAll() */ function config_get_storage_names_with_prefix($prefix = '') { return drupal_container()->get('config.storage')->listAll($prefix); @@ -137,7 +136,7 @@ function config_sync_changes(array $config_changes, StorageInterface $source_sto */ function config_import() { // Retrieve a list of differences between staging and the active store. - $source_storage = new FileStorage(array('directory' => config_get_config_directory(CONFIG_STAGING_DIRECTORY))); + $source_storage = drupal_container()->get('config.storage.staging'); $target_storage = drupal_container()->get('config.storage'); $config_changes = config_sync_get_changes($source_storage, $target_storage); @@ -219,7 +218,7 @@ function config_import_invoke_owner(array $config_changes, StorageInterface $sou function config_export() { // Retrieve a list of differences between the active store and staging. $source_storage = drupal_container()->get('config.storage'); - $target_storage = new FileStorage(array('directory' => config_get_config_directory(CONFIG_STAGING_DIRECTORY))); + $target_storage = drupal_container()->get('config.storage.staging'); $config_changes = config_sync_get_changes($source_storage, $target_storage); if (empty($config_changes)) { diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 2278112..c4c5ac7 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -5,6 +5,8 @@ use Drupal\Core\Database\Database; use Drupal\Core\Database\Install\TaskException; use Drupal\Core\Language\Language; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -272,6 +274,42 @@ function install_begin_request(&$install_state) { include_once DRUPAL_ROOT . '/core/includes/module.inc'; include_once DRUPAL_ROOT . '/core/includes/session.inc'; + // Determine whether the configuration system is ready to operate. + $install_state['config_verified'] = install_verify_config_directory(CONFIG_ACTIVE_DIRECTORY) && install_verify_config_directory(CONFIG_STAGING_DIRECTORY); + + // If it is not, replace the configuration storage with the InstallStorage + // implementation, for the following reasons: + // - The first call into drupal_container() will try to set up the regular + // runtime configuration storage, using the CachedFileStorage. The storage + // controller options require to pass in the config directory name, but that + // directory does not exist yet. + // - The installer outputs maintenance theme pages and performs many other + // operations, which try to load configuration. Since there is no active + // configuration yet, and because the configuration system does not have a + // notion of default values at runtime, data is missing in many places. The + // lack of data does not trigger errors, but results in a broken user + // interface (e.g., missing page title, etc). + // - The actual configuration data to read during installation is essentially + // the default configuration provided by the installation profile and + // modules (most notably System module). The InstallStorage therefore reads + // from the default configuration directories of extensions. + // This override is reverted as soon as the config directory has been set up + // successfully. + // @see drupal_install_config_directory() + // @todo Move this into a proper Drupal\Core\DependencyInjection\InstallContainerBuilder. + if (!$install_state['config_verified']) { + $container = new ContainerBuilder(); + + $container->register('dispatcher', 'Symfony\Component\EventDispatcher\EventDispatcher'); + + $container->register('config.storage', 'Drupal\Core\Config\InstallStorage'); + $container->register('config.factory', 'Drupal\Core\Config\ConfigFactory') + ->addArgument(new Reference('config.storage')) + ->addArgument(new Reference('dispatcher')); + + drupal_container($container); + } + // Set up $language, so t() caller functions will still work. drupal_language_initialize(); @@ -316,7 +354,6 @@ function install_begin_request(&$install_state) { // Check existing settings.php. $install_state['database_verified'] = install_verify_database_settings(); - $install_state['config_verified'] = install_verify_config_directory(CONFIG_ACTIVE_DIRECTORY) && install_verify_config_directory(CONFIG_STAGING_DIRECTORY); $install_state['settings_verified'] = $install_state['config_verified'] && $install_state['database_verified']; if ($install_state['database_verified']) { @@ -1054,6 +1091,11 @@ function install_settings_form_submit($form, &$form_state) { // Add the config directories to settings.php. drupal_install_config_directories(); + // We have valid configuration directories in settings.php. + // Reset the service container, so the config.storage service will use the + // actual cached storage for installing configuration. + drupal_container(NULL, TRUE); + // Indicate that the settings file has been verified, and check the database // for the last completed task, now that we have a valid connection. This // last step is important since we want to trigger an error if the new diff --git a/core/includes/install.inc b/core/includes/install.inc index 6109fe0..e7e2729 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -275,7 +275,7 @@ function drupal_install_config_directories() { drupal_rewrite_settings($settings); } - // Ensure that the config directory exists or can be created, and is writable. + // Ensure the config directories exist or can be created, and are writable. foreach (array(CONFIG_ACTIVE_DIRECTORY, CONFIG_STAGING_DIRECTORY) as $config_type) { // This should never fail, since if the config directory was specified in // settings.php it will have already been created and verified earlier, and @@ -296,7 +296,7 @@ function drupal_install_config_directories() { * Checks whether a config directory name is defined, and if so, whether it * exists and is writable. * - * This partically duplicates install_ensure_config_directory(), but is required + * This partially duplicates install_ensure_config_directory(), but is required * since the installer would create the config directory too early in the * installation process otherwise (e.g., when only visiting install.php when * there is a settings.php already, but not actually executing the installation). @@ -313,9 +313,17 @@ function install_verify_config_directory($type) { if (!isset($config_directories[$type])) { return FALSE; } - $config_directory = config_get_config_directory($type); - if (is_dir($config_directory) && is_writable($config_directory)) { - return TRUE; + // config_get_config_directory() throws an exception when the $type passed + // it doesn't exist yet in $config_directories. This can happen if there is + // a prepared settings.php that defines $config_directories already and the + // directories do not exist yet. + try { + $config_directory = config_get_config_directory($type); + if (is_dir($config_directory) && is_writable($config_directory)) { + return TRUE; + } + } + catch (\Exception $e) { } return FALSE; } diff --git a/core/includes/module.inc b/core/includes/module.inc index d9eab10..bfa4268 100644 --- a/core/includes/module.inc +++ b/core/includes/module.inc @@ -6,7 +6,6 @@ */ use Drupal\Component\Graph\Graph; -use Drupal\Core\Config\DatabaseStorage; /** * Loads all the modules that have been enabled in the system table. @@ -617,7 +616,7 @@ function module_uninstall($module_list = array(), $uninstall_dependents = TRUE) $module_list = array_keys($module_list); } - $storage = new DatabaseStorage(); + $storage = drupal_container()->get('config.storage'); foreach ($module_list as $module) { // Uninstall the module. module_load_install($module); diff --git a/core/includes/update.inc b/core/includes/update.inc index 5582bb4..9dd8456 100644 --- a/core/includes/update.inc +++ b/core/includes/update.inc @@ -1056,7 +1056,7 @@ function update_variables_to_config($config_name, array $variable_map) { $module = strtok($config_name, '.'); // Load and set default configuration values. - $file = new FileStorage(array('directory' => drupal_get_path('module', $module) . '/config')); + $file = new FileStorage(drupal_get_path('module', $module) . '/config'); if (!$file->exists($config_name)) { throw new ConfigException("Default configuration file $config_name for $module extension not found but is required to exist."); } diff --git a/core/lib/Drupal/Core/Cache/CacheFactory.php b/core/lib/Drupal/Core/Cache/CacheFactory.php new file mode 100644 index 0000000..ca36824 --- /dev/null +++ b/core/lib/Drupal/Core/Cache/CacheFactory.php @@ -0,0 +1,11 @@ +delegate = $delegate; + $this->cache = $cache; + } + + /** + * Implements Drupal\Core\Config\StorageInterface::exists(). + */ + public function exists($name) { + return $this->delegate->exists($name); + } + + /** + * Implements Drupal\Core\Config\StorageInterface::read(). + */ + public function read($name) { + if ($cache = $this->cache->get($name)) { + return $cache->data; + } + return $this->delegate->read($name); + } + + /** + * Implements Drupal\Core\Config\StorageInterface::write(). + */ + public function write($name, array $data) { + $this->cache->set($name, $data, CacheBackendInterface::CACHE_PERMANENT, array('config' => array($name))); + $this->delegate->write($name, $data); + return TRUE; + } + + /** + * Implements Drupal\Core\Config\StorageInterface::delete(). + */ + public function delete($name) { + $this->cache->delete($name); + $this->delegate->delete($name); + return TRUE; + } + + /** + * Implements Drupal\Core\Config\StorageInterface::rename(). + */ + public function rename($name, $new_name) { + $this->cache->delete($name); + $this->cache->delete($new_name); + $this->delegate->rename($name, $new_name); + return TRUE; + } + + /** + * Implements Drupal\Core\Config\StorageInterface::encode(). + */ + public static function encode($data) { + return serialize($data); + } + + /** + * Implements Drupal\Core\Config\StorageInterface::decode(). + * + * @throws ErrorException + * unserialize() triggers E_NOTICE if the string cannot be unserialized. + */ + public static function decode($raw) { + $data = @unserialize($raw); + return is_array($data) ? $data : FALSE; + } + + /** + * Implements Drupal\Core\Config\StorageInterface::listAll(). + * + * Not supported by CacheBackendInterface. + */ + public function listAll($prefix = '') { + return $this->delegate->listAll($prefix); + } +} diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php deleted file mode 100644 index ad8c155..0000000 --- a/core/lib/Drupal/Core/Config/DatabaseStorage.php +++ /dev/null @@ -1,146 +0,0 @@ - 'default', - 'target' => 'default', - ); - $this->options = $options; - } - - /** - * Returns the database connection to use. - */ - protected function getConnection() { - return Database::getConnection($this->options['target'], $this->options['connection']); - } - - /** - * Implements Drupal\Core\Config\StorageInterface::read(). - * - * @throws PDOException - * @throws Drupal\Core\Database\DatabaseExceptionWrapper - * Only thrown in case $this->options['throw_exception'] is TRUE. - */ - public function read($name) { - $data = FALSE; - // There are situations, like in the installer, where we may attempt a - // read without actually having the database available. In this case, - // catch the exception and just return an empty array so the caller can - // handle it if need be. - // @todo Remove this and use appropriate config.storage service definition - // in the installer instead. - try { - $raw = $this->getConnection()->query('SELECT data FROM {config} WHERE name = :name', array(':name' => $name), $this->options)->fetchField(); - if ($raw !== FALSE) { - $data = $this->decode($raw); - } - } - catch (Exception $e) { - } - return $data; - } - - /** - * Implements Drupal\Core\Config\StorageInterface::write(). - * - * @throws PDOException - * - * @todo Ignore slave targets for data manipulation operations. - */ - public function write($name, array $data) { - $data = $this->encode($data); - $options = array('return' => Database::RETURN_AFFECTED) + $this->options; - return (bool) $this->getConnection()->merge('config', $options) - ->key(array('name' => $name)) - ->fields(array('data' => $data)) - ->execute(); - } - - /** - * Implements Drupal\Core\Config\StorageInterface::delete(). - * - * @throws PDOException - * - * @todo Ignore slave targets for data manipulation operations. - */ - public function delete($name) { - $options = array('return' => Database::RETURN_AFFECTED) + $this->options; - return (bool) $this->getConnection()->delete('config', $options) - ->condition('name', $name) - ->execute(); - } - - - /** - * Implements Drupal\Core\Config\StorageInterface::rename(). - * - * @throws PDOException - */ - public function rename($name, $new_name) { - $options = array('return' => Database::RETURN_AFFECTED) + $this->options; - return (bool) $this->getConnection()->update('config', $options) - ->fields(array('name' => $new_name)) - ->condition('name', $name) - ->execute(); - } - - /** - * Implements Drupal\Core\Config\StorageInterface::encode(). - */ - public static function encode($data) { - return serialize($data); - } - - /** - * Implements Drupal\Core\Config\StorageInterface::decode(). - * - * @throws ErrorException - * unserialize() triggers E_NOTICE if the string cannot be unserialized. - */ - public static function decode($raw) { - $data = @unserialize($raw); - return is_array($data) ? $data : FALSE; - } - - /** - * Implements Drupal\Core\Config\StorageInterface::listAll(). - * - * @throws PDOException - * @throws Drupal\Core\Database\DatabaseExceptionWrapper - * Only thrown in case $this->options['throw_exception'] is TRUE. - */ - public function listAll($prefix = '') { - return $this->getConnection()->query('SELECT name FROM {config} WHERE name LIKE :name', array( - ':name' => db_like($prefix) . '%', - ), $this->options)->fetchCol(); - } -} diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php index d96af7e..716373e 100644 --- a/core/lib/Drupal/Core/Config/FileStorage.php +++ b/core/lib/Drupal/Core/Config/FileStorage.php @@ -15,22 +15,17 @@ use Symfony\Component\Yaml\Yaml; class FileStorage implements StorageInterface { /** - * Configuration options for this storage controller. + * The filesystem path for configuration objects. * - * - directory: The filesystem path for configuration objects. - * - * @var array + * @var string */ - protected $options; + protected $directory = ''; /** * Implements Drupal\Core\Config\StorageInterface::__construct(). */ - public function __construct(array $options = array()) { - if (!isset($options['directory'])) { - $options['directory'] = config_get_config_directory(); - } - $this->options = $options; + public function __construct($directory) { + $this->directory = $directory; } /** @@ -40,7 +35,7 @@ class FileStorage implements StorageInterface { * The path to the configuration file. */ public function getFilePath($name) { - return $this->options['directory'] . '/' . $name . '.' . self::getFileExtension(); + return $this->directory . '/' . $name . '.' . self::getFileExtension(); } /** @@ -99,8 +94,8 @@ class FileStorage implements StorageInterface { */ public function delete($name) { if (!$this->exists($name)) { - if (!file_exists($this->options['directory'])) { - throw new StorageException($this->options['directory'] . '/ not found.'); + if (!file_exists($this->directory)) { + throw new StorageException($this->directory . '/ not found.'); } return FALSE; } @@ -149,11 +144,11 @@ class FileStorage implements StorageInterface { public function listAll($prefix = '') { // glob() silently ignores the error of a non-existing search directory, // even with the GLOB_ERR flag. - if (!file_exists($this->options['directory'])) { - throw new StorageException($this->options['directory'] . '/ not found.'); + if (!file_exists($this->directory)) { + throw new StorageException($this->directory . '/ not found.'); } $extension = '.' . self::getFileExtension(); - $files = glob($this->options['directory'] . '/' . $prefix . '*' . $extension); + $files = glob($this->directory . '/' . $prefix . '*' . $extension); $clean_name = function ($value) use ($extension) { return basename($value, $extension); }; diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php new file mode 100644 index 0000000..f232f63 --- /dev/null +++ b/core/lib/Drupal/Core/Config/InstallStorage.php @@ -0,0 +1,95 @@ + $name, + ))); + } + + /** + * Overrides Drupal\Core\Config\FileStorage::write(). + * + * @throws Drupal\Core\Config\StorageException + */ + public function write($name, array $data) { + throw new StorageException('Write operation is not allowed during install.'); + } + + /** + * Overrides Drupal\Core\Config\FileStorage::delete(). + * + * @throws Drupal\Core\Config\StorageException + */ + public function delete($name) { + throw new StorageException('Delete operation is not allowed during install.'); + } + + /** + * Overrides Drupal\Core\Config\FileStorage::rename(). + * + * @throws Drupal\Core\Config\StorageException + */ + public function rename($name, $new_name) { + throw new StorageException('Rename operation is not allowed during install.'); + } + + /** + * Implements Drupal\Core\Config\StorageInterface::listAll(). + * + * @throws Drupal\Core\Config\StorageException + */ + public function listAll($prefix = '') { + throw new StorageException('List operation is not allowed during install.'); + } +} diff --git a/core/lib/Drupal/Core/Config/NullStorage.php b/core/lib/Drupal/Core/Config/NullStorage.php index ea21be1..36cdc29 100644 --- a/core/lib/Drupal/Core/Config/NullStorage.php +++ b/core/lib/Drupal/Core/Config/NullStorage.php @@ -22,10 +22,12 @@ namespace Drupal\Core\Config; * This also can be used for testing purposes. */ class NullStorage implements StorageInterface { + /** - * Implements Drupal\Core\Config\StorageInterface::__construct(). + * Implements Drupal\Core\Config\StorageInterface::exists(). */ - public function __construct(array $options = array()) { + public function exists($name) { + return FALSE; } /** diff --git a/core/lib/Drupal/Core/Config/StorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php index a466538..9a2caa7 100644 --- a/core/lib/Drupal/Core/Config/StorageInterface.php +++ b/core/lib/Drupal/Core/Config/StorageInterface.php @@ -16,13 +16,15 @@ namespace Drupal\Core\Config; interface StorageInterface { /** - * Constructs the storage controller. + * Returns whether a configuration object exists. * - * @param array $options - * An associative array containing configuration options specific to the - * storage controller. + * @param string $name + * The name of a configuration object to test. + * + * @return bool + * TRUE if the configuration object exists, FALSE otherwise. */ - public function __construct(array $options = array()); + public function exists($name); /** * Reads configuration data from the storage. diff --git a/core/modules/config/lib/Drupal/config/ConfigStorageController.php b/core/modules/config/lib/Drupal/config/ConfigStorageController.php index 031eead..f806532 100644 --- a/core/modules/config/lib/Drupal/config/ConfigStorageController.php +++ b/core/modules/config/lib/Drupal/config/ConfigStorageController.php @@ -277,7 +277,8 @@ class ConfigStorageController implements StorageControllerInterface { // Configuration objects do not have a schema. Extract all key names from // class properties. $class_info = new \ReflectionClass($entity); - foreach ($class_info->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) { + $properties = $class_info->getProperties(\ReflectionProperty::IS_PUBLIC); + foreach ($properties as $property) { $name = $property->getName(); $config->set($name, $entity->$name); } diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php index a5d36a9..9eea495 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php @@ -7,7 +7,6 @@ namespace Drupal\config\Tests; -use Drupal\Core\Config\DatabaseStorage; use Drupal\simpletest\WebTestBase; /** @@ -26,7 +25,7 @@ class ConfigCRUDTest extends WebTestBase { * Tests CRUD operations. */ function testCRUD() { - $storage = new DatabaseStorage(); + $storage = $this->container->get('config.storage'); $name = 'config_test.crud'; $config = config($name); diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigFileContentTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigFileContentTest.php index abbd2ae..f3d91b0 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigFileContentTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigFileContentTest.php @@ -7,7 +7,6 @@ namespace Drupal\config\Tests; -use Drupal\Core\Config\DatabaseStorage; use Drupal\Core\Config\FileStorage; use Drupal\simpletest\WebTestBase; @@ -23,15 +22,11 @@ class ConfigFileContentTest extends WebTestBase { ); } - function setUp() { - parent::setUp(); - } - /** * Tests setting, writing, and reading of a configuration setting. */ function testReadWriteConfig() { - $database_storage = new DatabaseStorage(); + $storage = $this->container->get('config.storage'); $name = 'foo.bar'; $key = 'foo'; @@ -67,8 +62,8 @@ class ConfigFileContentTest extends WebTestBase { $this->assertEqual($config->get(), array(), t('New config object is empty.')); // Verify nothing was saved. - $db_data = $database_storage->read($name); - $this->assertIdentical($db_data, FALSE); + $data = $storage->read($name); + $this->assertIdentical($data, FALSE); // Add a top level value $config = config($name); @@ -94,8 +89,8 @@ class ConfigFileContentTest extends WebTestBase { $config->save(); // Verify the database entry exists. - $db_data = $database_storage->read($name); - $this->assertTrue($db_data); + $data = $storage->read($name); + $this->assertTrue($data); // Read top level value $config = config($name); @@ -152,27 +147,27 @@ class ConfigFileContentTest extends WebTestBase { $config->set($key, $value)->save(); // Verify the database entry exists from a chained save. - $db_data = $database_storage->read($chained_name); - $this->assertEqual($db_data, $config->get()); + $data = $storage->read($chained_name); + $this->assertEqual($data, $config->get()); // Get file listing for all files starting with 'foo'. Should return // two elements. - $files = $database_storage->listAll('foo'); + $files = $storage->listAll('foo'); $this->assertEqual(count($files), 2, 'Two files listed with the prefix \'foo\'.'); // Get file listing for all files starting with 'biff'. Should return // one element. - $files = $database_storage->listAll('biff'); + $files = $storage->listAll('biff'); $this->assertEqual(count($files), 1, 'One file listed with the prefix \'biff\'.'); // Get file listing for all files starting with 'foo.bar'. Should return // one element. - $files = $database_storage->listAll('foo.bar'); + $files = $storage->listAll('foo.bar'); $this->assertEqual(count($files), 1, 'One file listed with the prefix \'foo.bar\'.'); // Get file listing for all files starting with 'bar'. Should return // an empty array. - $files = $database_storage->listAll('bar'); + $files = $storage->listAll('bar'); $this->assertEqual($files, array(), 'No files listed with the prefix \'bar\'.'); // Delete the configuration. @@ -180,8 +175,8 @@ class ConfigFileContentTest extends WebTestBase { $config->delete(); // Verify the database entry no longer exists. - $db_data = $database_storage->read($name); - $this->assertIdentical($db_data, FALSE); + $data = $storage->read($name); + $this->assertIdentical($data, FALSE); } /** @@ -205,7 +200,7 @@ class ConfigFileContentTest extends WebTestBase { ); // Encode and write, and reload and decode the configuration data. - $filestorage = new FileStorage(); + $filestorage = new FileStorage(config_get_config_directory()); $filestorage->write($name, $config_data); $config_parsed = $filestorage->read($name); diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php index 0c1fe68..9316962 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php @@ -7,8 +7,6 @@ namespace Drupal\config\Tests; -use Drupal\Core\Config\DatabaseStorage; -use Drupal\Core\Config\FileStorage; use Drupal\simpletest\WebTestBase; /** @@ -64,8 +62,8 @@ class ConfigImportTest extends WebTestBase { function testDeleted() { $name = 'config_test.system'; $dynamic_name = 'config_test.dynamic.default'; - $active_storage = new DatabaseStorage(); - $staging_storage = new FileStorage(array('directory' => config_get_config_directory(CONFIG_STAGING_DIRECTORY))); + $storage = $this->container->get('config.storage'); + $staging = $this->container->get('config.storage.staging'); // Verify the default configuration values exist. $config = config($name); @@ -77,15 +75,15 @@ class ConfigImportTest extends WebTestBase { config_export(); // Delete the configuration objects from the staging directory. - $staging_storage->delete($name); - $staging_storage->delete($dynamic_name); + $staging->delete($name); + $staging->delete($dynamic_name); // Import. config_import(); // Verify the values have disappeared. - $this->assertIdentical($active_storage->read($name), FALSE); - $this->assertIdentical($active_storage->read($dynamic_name), FALSE); + $this->assertIdentical($storage->read($name), FALSE); + $this->assertIdentical($storage->read($dynamic_name), FALSE); $config = config($name); $this->assertIdentical($config->get('foo'), NULL); @@ -99,6 +97,9 @@ class ConfigImportTest extends WebTestBase { $this->assertFalse(isset($GLOBALS['hook_config_test']['update'])); $this->assertTrue(isset($GLOBALS['hook_config_test']['predelete'])); $this->assertTrue(isset($GLOBALS['hook_config_test']['delete'])); + + // Verify that there is nothing more to import. + $this->assertFalse(config_sync_get_changes($staging, $storage)); } /** @@ -107,27 +108,34 @@ class ConfigImportTest extends WebTestBase { function testNew() { $name = 'config_test.new'; $dynamic_name = 'config_test.dynamic.new'; - $staging_storage = new FileStorage(array('directory' => config_get_config_directory(CONFIG_STAGING_DIRECTORY))); + $storage = $this->container->get('config.storage'); + $staging = $this->container->get('config.storage.staging'); // Export. config_export(); // Verify the configuration to create does not exist yet. - $this->assertIdentical($staging_storage->exists($name), FALSE, $name . ' not found.'); - $this->assertIdentical($staging_storage->exists($dynamic_name), FALSE, $dynamic_name . ' not found.'); + $this->assertIdentical($storage->exists($name), FALSE, $name . ' not found.'); + $this->assertIdentical($storage->exists($dynamic_name), FALSE, $dynamic_name . ' not found.'); + + $this->assertIdentical($staging->exists($name), FALSE, $name . ' not found.'); + $this->assertIdentical($staging->exists($dynamic_name), FALSE, $dynamic_name . ' not found.'); // Create new configuration objects in the staging directory. $original_name_data = array( 'add_me' => 'new value', ); - $staging_storage->write($name, $original_name_data); + $staging->write($name, $original_name_data); $original_dynamic_data = array( 'id' => 'new', 'label' => 'New', + 'langcode' => 'und', + 'style' => '', + 'uuid' => '30df59bd-7b03-4cf7-bb35-d42fc49f0651', ); - $staging_storage->write($dynamic_name, $original_dynamic_data); - $this->assertIdentical($staging_storage->exists($name), TRUE, $name . ' found.'); - $this->assertIdentical($staging_storage->exists($dynamic_name), TRUE, $dynamic_name . ' found.'); + $staging->write($dynamic_name, $original_dynamic_data); + $this->assertIdentical($staging->exists($name), TRUE, $name . ' found.'); + $this->assertIdentical($staging->exists($dynamic_name), TRUE, $dynamic_name . ' found.'); // Import. config_import(); @@ -145,6 +153,9 @@ class ConfigImportTest extends WebTestBase { $this->assertFalse(isset($GLOBALS['hook_config_test']['update'])); $this->assertFalse(isset($GLOBALS['hook_config_test']['predelete'])); $this->assertFalse(isset($GLOBALS['hook_config_test']['delete'])); + + // Verify that there is nothing more to import. + $this->assertFalse(config_sync_get_changes($staging, $storage)); } /** @@ -153,26 +164,28 @@ class ConfigImportTest extends WebTestBase { function testUpdated() { $name = 'config_test.system'; $dynamic_name = 'config_test.dynamic.default'; - $staging_storage = new FileStorage(array('directory' => config_get_config_directory(CONFIG_STAGING_DIRECTORY))); + $storage = $this->container->get('config.storage'); + $staging = $this->container->get('config.storage.staging'); // Export. config_export(); // Verify that the configuration objects to import exist. - $this->assertIdentical($staging_storage->exists($name), TRUE, $name . ' found.'); - $this->assertIdentical($staging_storage->exists($dynamic_name), TRUE, $dynamic_name . ' found.'); + $this->assertIdentical($storage->exists($name), TRUE, $name . ' found.'); + $this->assertIdentical($storage->exists($dynamic_name), TRUE, $dynamic_name . ' found.'); + + $this->assertIdentical($staging->exists($name), TRUE, $name . ' found.'); + $this->assertIdentical($staging->exists($dynamic_name), TRUE, $dynamic_name . ' found.'); // Replace the file content of the existing configuration objects in the // staging directory. $original_name_data = array( 'foo' => 'beer', ); - $staging_storage->write($name, $original_name_data); - $original_dynamic_data = array( - 'id' => 'default', - 'label' => 'Updated', - ); - $staging_storage->write($dynamic_name, $original_dynamic_data); + $staging->write($name, $original_name_data); + $original_dynamic_data = $staging->read($dynamic_name); + $original_dynamic_data['label'] = 'Updated'; + $staging->write($dynamic_name, $original_dynamic_data); // Verify the active store still returns the default values. $config = config($name); @@ -190,8 +203,8 @@ class ConfigImportTest extends WebTestBase { $this->assertIdentical($config->get('label'), 'Updated'); // Verify that the original file content is still the same. - $this->assertIdentical($staging_storage->read($name), $original_name_data); - $this->assertIdentical($staging_storage->read($dynamic_name), $original_dynamic_data); + $this->assertIdentical($staging->read($name), $original_name_data); + $this->assertIdentical($staging->read($dynamic_name), $original_dynamic_data); // Verify that appropriate module API hooks have been invoked. $this->assertTrue(isset($GLOBALS['hook_config_test']['load'])); @@ -200,6 +213,9 @@ class ConfigImportTest extends WebTestBase { $this->assertTrue(isset($GLOBALS['hook_config_test']['update'])); $this->assertFalse(isset($GLOBALS['hook_config_test']['predelete'])); $this->assertFalse(isset($GLOBALS['hook_config_test']['delete'])); + + // Verify that there is nothing more to import. + $this->assertFalse(config_sync_get_changes($staging, $storage)); } } diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php b/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php index d07b0b7..6b7a74f 100644 --- a/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php +++ b/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php @@ -32,6 +32,9 @@ abstract class ConfigStorageTestBase extends WebTestBase { function testCRUD() { $name = 'config_test.storage'; + // Checking whether a non-existing name exists returns FALSE. + $this->assertIdentical($this->storage->exists($name), FALSE); + // Reading a non-existing name returns FALSE. $data = $this->storage->read($name); $this->assertIdentical($data, FALSE); @@ -51,9 +54,13 @@ abstract class ConfigStorageTestBase extends WebTestBase { $data = array('foo' => 'bar'); $result = $this->storage->write($name, $data); $this->assertIdentical($result, TRUE); + $raw_data = $this->read($name); $this->assertIdentical($raw_data, $data); + // Checking whether an existing name exists returns TRUE. + $this->assertIdentical($this->storage->exists($name), TRUE); + // Writing the identical data again still returns TRUE. $result = $this->storage->write($name, $data); $this->assertIdentical($result, TRUE); diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php b/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php deleted file mode 100644 index 2e1599f..0000000 --- a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php +++ /dev/null @@ -1,46 +0,0 @@ - 'DatabaseStorage controller operations', - 'description' => 'Tests DatabaseStorage controller operations.', - 'group' => 'Configuration', - ); - } - - function setUp() { - parent::setUp(); - $this->storage = new DatabaseStorage(); - $this->invalidStorage = new DatabaseStorage(array('connection' => 'invalid')); - } - - protected function read($name) { - $data = db_query('SELECT data FROM {config} WHERE name = :name', array(':name' => $name))->fetchField(); - return unserialize($data); - } - - protected function insert($name, $data) { - db_insert('config')->fields(array('name' => $name, 'data' => $data))->execute(); - } - - protected function update($name, $data) { - db_update('config')->fields(array('data' => $data))->condition('name', $name)->execute(); - } - - protected function delete($name) { - db_delete('config')->condition('name', $name)->execute(); - } -} 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 0fd2ba4..61b3906 100644 --- a/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php @@ -24,8 +24,8 @@ class FileStorageTest extends ConfigStorageTestBase { function setUp() { parent::setUp(); - $this->storage = new FileStorage(); - $this->invalidStorage = new FileStorage(array('directory' => $this->configDirectories[CONFIG_ACTIVE_DIRECTORY] . '/nonexisting')); + $this->storage = new FileStorage(config_get_config_directory()); + $this->invalidStorage = new FileStorage($this->configDirectories[CONFIG_ACTIVE_DIRECTORY] . '/nonexisting'); // FileStorage::listAll() requires other configuration data to exist. $this->storage->write('system.performance', config('system.performance')->get()); diff --git a/core/modules/entity/lib/Drupal/entity/Entity.php b/core/modules/entity/lib/Drupal/entity/Entity.php index 2d6ac5c..dae1760 100644 --- a/core/modules/entity/lib/Drupal/entity/Entity.php +++ b/core/modules/entity/lib/Drupal/entity/Entity.php @@ -45,7 +45,7 @@ class Entity implements EntityInterface { * * @var bool */ - public $isCurrentRevision = TRUE; + protected $isCurrentRevision = TRUE; /** * Constructs a new entity object. @@ -280,8 +280,11 @@ class Entity implements EntityInterface { /** * Implements Drupal\entity\EntityInterface::isCurrentRevision(). */ - public function isCurrentRevision() { - return $this->isCurrentRevision; + public function isCurrentRevision($new_value = NULL) { + $return = $this->isCurrentRevision; + if (isset($new_value)) { + $this->isCurrentRevision = (bool) $new_value; + } + return $return; } - } diff --git a/core/modules/entity/lib/Drupal/entity/EntityInterface.php b/core/modules/entity/lib/Drupal/entity/EntityInterface.php index a111d55..68fee11 100644 --- a/core/modules/entity/lib/Drupal/entity/EntityInterface.php +++ b/core/modules/entity/lib/Drupal/entity/EntityInterface.php @@ -211,8 +211,12 @@ interface EntityInterface { /** * Checks if this entity is the current revision. * + * @param bool $new_value + * (optional) A Boolean to (re)set the isCurrentRevision flag. + * * @return bool - * TRUE if the entity is the current revision, FALSE otherwise. + * TRUE if the entity is the current revision, FALSE otherwise. If + * $new_value was passed, the previous value is returned. */ - public function isCurrentRevision(); + public function isCurrentRevision($new_value = NULL); } diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchExcerptTest.php b/core/modules/search/lib/Drupal/search/Tests/SearchExcerptTest.php index b96049e..99fd422 100644 --- a/core/modules/search/lib/Drupal/search/Tests/SearchExcerptTest.php +++ b/core/modules/search/lib/Drupal/search/Tests/SearchExcerptTest.php @@ -7,12 +7,14 @@ namespace Drupal\search\Tests; -use Drupal\simpletest\UnitTestBase; +use Drupal\simpletest\WebTestBase; /** * Tests the search_excerpt() function. */ -class SearchExcerptTest extends UnitTestBase { +class SearchExcerptTest extends WebTestBase { + public static $modules = array('search'); + public static function getInfo() { return array( 'name' => 'Search excerpt extraction', @@ -21,11 +23,6 @@ class SearchExcerptTest extends UnitTestBase { ); } - function setUp() { - drupal_load('module', 'search'); - parent::setUp(); - } - /** * Tests search_excerpt() with several simulated search keywords. * diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php index 9654f9c..253d4df 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php @@ -726,6 +726,10 @@ abstract class TestBase { $GLOBALS['config_directories'][$type] = 'simpletest/' . substr($this->databasePrefix, 10) . '/config_' . $type; } + // Reset and create a new service container. + drupal_container(NULL, TRUE); + $this->container = drupal_container(); + $this->configDirectories = array(); include_once DRUPAL_ROOT . '/core/includes/install.inc'; foreach ($GLOBALS['config_directories'] as $type => $path) { diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php index ddf38df..aeed6b7 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -674,6 +674,7 @@ abstract class WebTestBase extends TestBase { // Symfony\Component\HttpKernel\handle(), this kernel needs manual booting // as it is not used to handle a request. $this->kernel->boot(); + $this->container = drupal_container(); // Reset/rebuild all data structures after enabling the modules. $this->resetAll(); diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php index 1698737..4a728f3 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php @@ -8,7 +8,6 @@ namespace Drupal\system\Tests\Module; use Drupal\Core\Database\Database; -use Drupal\Core\Config\DatabaseStorage; use Drupal\Core\Config\FileStorage; use Drupal\simpletest\WebTestBase; @@ -99,7 +98,7 @@ abstract class ModuleTestBase extends WebTestBase { if (!is_dir($module_config_dir)) { return; } - $module_file_storage = new FileStorage(array('directory' => $module_config_dir)); + $module_file_storage = new FileStorage($module_config_dir); $names = $module_file_storage->listAll(); // Verify that the config directory is not empty. diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 486afba..2edca25 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -724,6 +724,8 @@ function system_schema() { ); $schema['cache_bootstrap'] = $schema['cache']; $schema['cache_bootstrap']['description'] = 'Cache table for data required to bootstrap Drupal, may be routed to a shared memory cache.'; + $schema['cache_config'] = $schema['cache']; + $schema['cache_config']['description'] = 'Cache table for configuration data.'; $schema['cache_form'] = $schema['cache']; $schema['cache_form']['description'] = 'Cache table for the form system to store recently built forms and their storage data, to be used in subsequent page requests.'; $schema['cache_page'] = $schema['cache']; @@ -733,28 +735,6 @@ function system_schema() { $schema['cache_path'] = $schema['cache']; $schema['cache_path']['description'] = 'Cache table for path alias lookup.'; - $schema['config'] = array( - 'description' => 'Default active store for the configuration system.', - 'fields' => array( - 'name' => array( - 'description' => 'The identifier for the configuration entry, such as module.example (the name of the file, minus the file extension).', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), - 'data' => array( - 'description' => 'The raw data for this configuration entry.', - 'type' => 'blob', - 'not null' => TRUE, - 'size' => 'big', - 'translatable' => TRUE, - ), - ), - 'primary key' => array('name'), - ); - - $schema['date_format_type'] = array( 'description' => 'Stores configured date format types.', 'fields' => array( @@ -1567,33 +1547,63 @@ function system_update_8002() { } /** - * Adds {config} table for new Configuration system. + * Creates {cache_config} cache table for the new configuration system. */ function system_update_8003() { - // @todo Temporary. - if (db_table_exists('config')) { - db_drop_table('config'); - } - db_create_table('config', array( - 'description' => 'Default active store for the configuration system.', + $cache_update = array( + 'description' => 'Cache table for configuration data.', 'fields' => array( - 'name' => array( - 'description' => 'The identifier for the configuration entry, such as module.example (the name of the file, minus the file extension).', + 'cid' => array( + 'description' => 'Primary Key: Unique cache ID.', 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', ), 'data' => array( - 'description' => 'The raw data for this configuration entry.', + 'description' => 'A collection of data to cache.', 'type' => 'blob', + 'not null' => FALSE, + 'size' => 'big', + ), + 'expire' => array( + 'description' => 'A Unix timestamp indicating when the cache entry should expire, or 0 for never.', + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, + ), + 'created' => array( + 'description' => 'A Unix timestamp indicating when the cache entry was created.', + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, + ), + 'serialized' => array( + 'description' => 'A flag to indicate whether content is serialized (1) or not (0).', + 'type' => 'int', + 'size' => 'small', 'not null' => TRUE, + 'default' => 0, + ), + 'tags' => array( + 'description' => 'Space-separated list of cache tags for this entry.', + 'type' => 'text', 'size' => 'big', - 'translatable' => TRUE, + 'not null' => FALSE, + ), + 'checksum' => array( + 'description' => 'The tag invalidation sum when this entry was saved.', + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, ), ), - 'primary key' => array('name'), - )); + 'indexes' => array( + 'expire' => array('expire'), + ), + 'primary key' => array('cid'), + ); + db_create_table('cache_config', $cache_update); } /** @@ -1673,7 +1683,7 @@ function system_update_8007() { foreach ($tables as $table) { // Assume we have a valid cache table if there is both 'cid' and 'data' // columns. - if (db_field_exists($table, 'cid') && db_field_exists($table, 'data')) { + if (db_field_exists($table, 'cid') && db_field_exists($table, 'data') && !db_field_exists($table, 'tags')) { db_add_field($table, 'tags', array( 'description' => 'Space-separated list of cache tags for this entry.', 'type' => 'text', diff --git a/core/modules/system/system.module b/core/modules/system/system.module index ad4c5dd..0ea066b 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -3509,7 +3509,7 @@ function system_cron() { */ function system_cache_flush() { // Do NOT flush the 'form' cache bin to retain in-progress form submissions. - return array('bootstrap', 'cache', 'page', 'path'); + return array('bootstrap', 'config', 'cache', 'page', 'path'); } /**