diff -u b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php --- b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php +++ b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php @@ -49,7 +49,7 @@ $system_data[$result['type']][$result['name']] = $result; } } - catch (\Exception $e) { + catch (\PDOException $e) { // The table might not exist for example in tests. } return $system_data; only in patch2: unchanged: --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -978,41 +978,31 @@ public function validateCredentialForm(array &$form, FormStateInterface $form_st return; } - try { - $connection = $this->getConnection($database); - $version = $this->getLegacyDrupalVersion($connection); - if (!$version) { - $form_state->setErrorByName($database['driver'] . '][0', $this->t('Source database does not contain a recognizable Drupal version.')); - } - else { - $this->createDatabaseStateSettings($database, $version); - $migrations = $this->getMigrations('migrate_drupal_' . $version, $version); - - // Get the system data from source database. - $system_data = $this->getSystemData($connection); - - // Convert the migration object into array - // so that it can be stored in form storage. - $migration_array = []; - foreach ($migrations as $migration) { - $migration_array[$migration->id()] = $migration->label(); - } - - // Store the retrieved migration IDs in form storage. - $form_state->set('migrations', $migration_array); - $form_state->set('source_base_path', $form_state->getValue('source_base_path')); - - // Store the retrived system data in form storage. - $form_state->set('system_data', $system_data); - } + $connection = $this->getConnection($database); + $version = $this->getLegacyDrupalVersion($connection); + if (!$version) { + $form_state->setErrorByName($database['driver'] . '][0', $this->t('Source database does not contain a recognizable Drupal version.')); } - catch (\Exception $e) { - $error_message = [ - '#title' => $this->t('Resolve the issue below to continue the upgrade.'), - '#theme' => 'item_list', - '#items' => [$e->getMessage()], - ]; - $form_state->setErrorByName($database['driver'] . '][0', $this->renderer->renderPlain($error_message)); + else { + $this->createDatabaseStateSettings($database, $version); + $migrations = $this->getMigrations('migrate_drupal_' . $version, $version); + + // Get the system data from source database. + $system_data = $this->getSystemData($connection); + + // Convert the migration object into array + // so that it can be stored in form storage. + $migration_array = []; + foreach ($migrations as $migration) { + $migration_array[$migration->id()] = $migration->label(); + } + + // Store the retrieved migration IDs in form storage. + $form_state->set('migrations', $migration_array); + $form_state->set('source_base_path', $form_state->getValue('source_base_path')); + + // Store the retrived system data in form storage. + $form_state->set('system_data', $system_data); } }