diff -u b/core/includes/bootstrap.inc b/core/includes/bootstrap.inc --- b/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2437,17 +2437,17 @@ // requests. $container = new ContainerBuilder(); - $container->register('config.storage.active', 'Drupal\Core\Config\FileStorage') + $container->register('config.cachedstorage.delegate', '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') + $container->register('config.cachedstorage.cache') ->setFactoryClass('Drupal\Core\Cache\CacheFactory') ->setFactoryMethod('get') ->addArgument('config'); + $container->register('config.storage.staging', 'Drupal\Core\Config\FileStorage') + ->addArgument(config_get_config_directory(CONFIG_STAGING_DIRECTORY)); $container->register('config.storage', 'Drupal\Core\Config\CachedStorage') - ->addArgument(new Reference('config.storage.active')) - ->addArgument(new Reference('config.cache')); + ->addArgument(new Reference('config.cachedstorage.delegate')) + ->addArgument(new Reference('config.cachedstorage.cache')); $container->register('config.subscriber.globalconf', 'Drupal\Core\EventSubscriber\ConfigGlobalOverrideSubscriber'); $container->register('dispatcher', 'Symfony\Component\EventDispatcher\EventDispatcher') @@ -2455,7 +2455,7 @@ // Register configuration object factory. $container->register('config.factory', 'Drupal\Core\Config\ConfigFactory') - ->addArgument(new Reference('config.storage.active')) + ->addArgument(new Reference('config.storage')) ->addArgument(new Reference('dispatcher')); }