diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 2517500..494b267 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -385,7 +385,7 @@ function install_begin_request(&$install_state) { $container ->register('keyvalue', 'Drupal\Core\KeyValueStore\KeyValueFactory') ->addArgument(new Reference('service_container')); - $container + $container ->register('keyvalue.memory', 'Drupal\Core\KeyValueStore\KeyValueMemoryFactory'); $container->register('lock', 'Drupal\Core\Lock\NullLockBackend'); $conf['cache_classes'] = array('cache' => 'Drupal\Core\Cache\MemoryBackend'); @@ -990,26 +990,26 @@ function install_system_rebuild(&$install_state) { // We need to unset all overrides and rebuild all necessary facilities to get // into a regular bootstrap state. unset($conf['cache_classes']); - unset($conf['keyvalue_default']); + unset($conf['keyvalue_default']); // Ensure that custom service definitions in a prepared settings.php are // applied. This effectively allows to install Drupal with custom Cache, // KeyValue, and Lock backends in the non-interactive installer. $conf_path = conf_path(); - if (is_readable(DRUPAL_ROOT . '/' . $conf_path . '/settings.php')) { + if (is_readable(DRUPAL_ROOT . '/' . $conf_path . '/settings.php')) { include DRUPAL_ROOT . '/' . $conf_path . '/settings.php'; } Drupal::moduleHandler()->reload(); - system_list_reset(); - Drupal::moduleHandler()->resetImplementations(); + system_list_reset(); + Drupal::moduleHandler()->resetImplementations(); - // Bootstrap, but avoid session initialization. + // Bootstrap, but avoid session initialization. // @see install_begin_request() drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES); - _drupal_bootstrap_code(); - $kernel = new DrupalKernel('prod', TRUE, drupal_classloader(), FALSE); - $kernel->boot(); + _drupal_bootstrap_code(); + $kernel = new DrupalKernel('prod', TRUE, drupal_classloader(), FALSE); + $kernel->boot(); $install_state['base_system_verified'] = TRUE; } diff --git a/core/includes/install.inc b/core/includes/install.inc index 5d6cb38..8a211a4 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -642,7 +642,7 @@ function drupal_install_system() { if ($last_removed = Drupal::moduleHandler()->invoke($module, 'update_last_removed')) { $version = max($version, $last_removed); } - drupal_set_installed_schema_version($module, $version); + drupal_set_installed_schema_version($module, $version); // Install default configuration. config_install_default_config('module', $module);