diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 407ad78..5639a84 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -386,9 +386,16 @@ function install_begin_request(&$install_state) { ->setFactoryService(new Reference('config.context.factory')) ->setFactoryMethod('get'); + $container->register('config.storage.schema', 'Drupal\Core\Config\Schema\SchemaStorage'); + + $container->register('config.typed', 'Drupal\Core\Config\TypedConfigManager') + ->addArgument(new Reference('config.storage')) + ->addArgument(new Reference('config.storage.schema')); + $container->register('config.factory', 'Drupal\Core\Config\ConfigFactory') ->addArgument(new Reference('config.storage')) - ->addArgument(new Reference('config.context')); + ->addArgument(new Reference('config.context')) + ->addArgument(new Reference('config.typed')); // Register the 'language_manager' service. $container diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php index 1d280b2..7b1e97c 100644 --- a/core/lib/Drupal/Core/Config/ConfigFactory.php +++ b/core/lib/Drupal/Core/Config/ConfigFactory.php @@ -91,7 +91,7 @@ public function get($name) { return $this->cache[$cache_key]; } - $this->cache[$cache_key] = new Config($name, $this->storage, $context, $this->typed_config); + $this->cache[$cache_key] = new Config($name, $this->storage, $context, $this->typedConfigManager); return $this->cache[$cache_key]->init(); } @@ -126,7 +126,7 @@ public function loadMultiple(array $names) { $storage_data = $this->storage->readMultiple($names); foreach ($storage_data as $name => $data) { $cache_key = $this->getCacheKey($name, $context); - $this->cache[$cache_key] = new Config($name, $this->storage, $context, $this->typed_config); + $this->cache[$cache_key] = new Config($name, $this->storage, $context, $this->typedConfigManager); $this->cache[$cache_key]->initWithData($data); $list[$name] = $this->cache[$cache_key]; } @@ -183,7 +183,7 @@ public function rename($old_name, $new_name) { } else { // Create the config object if it's not yet loaded into the static cache. - $config = new Config($old_name, $this->storage, $context, $this->typed_config); + $config = new Config($old_name, $this->storage, $context, $this->typedConfigManager); } $this->cache[$new_cache_key] = $config;