Issue #3135310 by alexpott: Remove completely unused 'database_ready' install state logic
(cherry picked from commit c0204735a8
)
merge-requests/64/head
parent
bf1f49b6f2
commit
70e87a954f
|
@ -204,8 +204,6 @@ function install_state_defaults() {
|
|||
'config_verified' => FALSE,
|
||||
// TRUE when there is a valid database connection.
|
||||
'database_verified' => FALSE,
|
||||
// TRUE if database is empty & ready to install.
|
||||
'database_ready' => FALSE,
|
||||
// TRUE when a valid settings.php exists (containing both database
|
||||
// connection information and config directory names).
|
||||
'settings_verified' => FALSE,
|
||||
|
@ -396,13 +394,6 @@ function install_begin_request($class_loader, &$install_state) {
|
|||
// settings like config_directories will be checked by system_requirements().
|
||||
$install_state['settings_verified'] = $install_state['database_verified'] && (bool) Settings::get('hash_salt', FALSE);
|
||||
|
||||
// Install factory tables only after checking the database.
|
||||
if ($install_state['database_verified'] && $install_state['database_ready']) {
|
||||
$container
|
||||
->register('path.matcher', 'Drupal\Core\Path\PathMatcher')
|
||||
->addArgument(new Reference('config.factory'));
|
||||
}
|
||||
|
||||
if ($install_state['settings_verified']) {
|
||||
try {
|
||||
$system_schema = system_schema();
|
||||
|
@ -799,7 +790,7 @@ function install_tasks($install_state) {
|
|||
],
|
||||
'install_write_profile' => [],
|
||||
'install_verify_database_ready' => [
|
||||
'run' => $install_state['database_ready'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED,
|
||||
'run' => INSTALL_TASK_RUN_IF_NOT_COMPLETED,
|
||||
],
|
||||
'install_base_system' => [
|
||||
'run' => $install_state['base_system_verified'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED,
|
||||
|
|
Loading…
Reference in New Issue