.gitattributes

+/dictionary.txt export-ignore
 /scripts  export-ignore

automatic_updates.install

@@ -5,7 +5,7 @@
  * Contains install and update functions for Automatic Updates.
  */
 
-use Drupal\automatic_updates\Validation\ReadinessRequirements;
+use Drupal\automatic_updates\Validation\StatusCheckRequirements;
 
 /**
  * Implements hook_uninstall().
@@ -20,8 +20,19 @@ function automatic_updates_uninstall() {
 function automatic_updates_requirements($phase) {
   if ($phase === 'runtime') {
     // Check that site is ready to perform automatic updates.
-    /** @var \Drupal\automatic_updates\Validation\ReadinessRequirements $readiness_requirement */
-    $readiness_requirement = \Drupal::classResolver(ReadinessRequirements::class);
-    return $readiness_requirement->getRequirements();
+    /** @var \Drupal\automatic_updates\Validation\StatusCheckRequirements $status_check_requirement */
+    $status_check_requirement = \Drupal::classResolver(StatusCheckRequirements::class);
+    return $status_check_requirement->getRequirements();
   }
 }
+
+/**
+ * Stores cached readiness check results under a new key.
+ */
+function automatic_updates_update_9001(): void {
+  /** @var \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface $key_value */
+  $key_value = \Drupal::service('keyvalue.expirable')
+    ->get('automatic_updates');
+  $key_value->rename('readiness_validation_last_run', 'status_check_last_run');
+  $key_value->rename('readiness_check_timestamp', 'status_check_timestamp');
+}

automatic_updates.module

@@ -6,30 +6,44 @@
  */
 
 use Drupal\automatic_updates\BatchProcessor;
+use Drupal\automatic_updates\CronUpdater;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\automatic_updates\Validation\AdminReadinessMessages;
-use Drupal\Core\Form\FormStateInterface;
+use Drupal\automatic_updates\Validation\AdminStatusCheckMessages;
 use Drupal\Core\Url;
 use Drupal\system\Controller\DbUpdateController;
+use Drupal\package_manager\Validator\ComposerExecutableValidator;
 
 /**
  * Implements hook_help().
  */
 function automatic_updates_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
-    case 'help.page.auto_updates':
+    case 'help.page.automatic_updates':
       $output = '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('Automatic Updates lets you update Drupal core.') . '</p>';
       $output .= '<p>';
       $output .= t('Automatic Updates will keep Drupal secure and up-to-date by automatically installing new patch-level updates, if available, when cron runs. It also provides a user interface to check if any updates are available and install them. You can <a href=":configure-form">configure Automatic Updates</a> to install all patch-level updates, only security updates, or no updates at all, during cron. By default, only security updates are installed during cron; this requires that you <a href=":update-form">install non-security updates through the user interface</a>.', [
         ':configure-form' => Url::fromRoute('update.settings')->toString(),
-        ':update-form' => Url::fromRoute('automatic_updates.report_update')->toString(),
+        ':update-form' => Url::fromRoute('update.report_update')->toString(),
       ]);
       $output .= '</p>';
       $output .= '<p>' . t('Additionally, Automatic Updates periodically runs checks to ensure that updates can be installed, and will warn site administrators if problems are detected.') . '</p>';
       $output .= '<h3>' . t('Requirements') . '</h3>';
       $output .= '<p>' . t('Automatic Updates requires a Composer executable whose version satisfies <code>@version</code>, and PHP must have permission to run it. The path to the executable may be set in the <code>package_manager.settings:executables.composer</code> config setting, or it will be automatically detected.', ['@version' => ComposerExecutableValidator::MINIMUM_COMPOSER_VERSION_CONSTRAINT]) . '</p>';
+      $output .= '<p id="cron-alternate-port">' . t('If your site is running on the built-in PHP web server, unattended (i.e., cron) updates may not work without one of the following workarounds:') . '</p>';
+      $output .= '<ul>';
+      $output .= '<li>' . t('Use a multithreaded web server, such as Apache, NGINX, or on Windows, IIS.') . '</li>';
+      $output .= '<li>' . t('Run another instance of the built-in PHP web server on a different port and configure automatic updates accordingly: <code>$config["automatic_updates.settings"]["cron_port"] = $alternate_port_number;</code>') . '</li>';
+      $output .= '</ul>';
       $output .= '<p>' . t('For more information, see the <a href=":automatic-updates-documentation">online documentation for the Automatic Updates module</a>.', [':automatic-updates-documentation' => 'https://www.drupal.org/docs/8/update/automatic-updates']) . '</p>';
+      $output .= '<h3 id="minor-update">' . t('Updating to another minor version of Drupal') . '</h3>';
+      $output .= '<p>';
+      $output .= t('Automatic Updates supports updating from one minor version of Drupal core to another; for example, from Drupal 9.4.8 to Drupal 9.5.0. This is only allowed when updating via <a href=":url">the user interface</a>. Unattended background updates can only update <em>within</em> the currently installed minor version (for example, Drupal 9.4.6 to 9.4.8).', [
+        ':url' => Url::fromRoute('update.report_update')->toString(),
+      ]);
+      $output .= '</p>';
+      $output .= '<p>' . t('This is because updating from one minor version of Drupal to another is riskier than staying within the current minor version. New minor versions of Drupal introduce changes that can, in some situations, be incompatible with installed modules and themes.') . '</p>';
+      $output .= '<p>' . t('Therefore, if you want to use Automatic Updates to update to another minor version of Drupal, it is strongly recommended to do a test update first, ideally on an isolated development copy of your site, before updating your production site.') . '</p>';
       return $output;
   }
 }
@@ -42,24 +56,55 @@ function automatic_updates_mail(string $key, array &$message, array $params): vo
   $options = [
     'langcode' => $message['langcode'],
   ];
-  switch ($key) {
-    case 'cron_successful':
-      $message['subject'] = t("Drupal core was successfully updated", [], $options);
-      $message['body'][] = t('Congratulations!', [], $options);
-      $message['body'][] = t('Drupal core was automatically updated from @previous_version to @updated_version.', [
-        '@previous_version' => $params['previous_version'],
-        '@updated_version' => $params['updated_version'],
-      ], $options);
-      break;
+  if ($key === 'cron_successful') {
+    $message['subject'] = t("Drupal core was successfully updated", [], $options);
+    $message['body'][] = t('Congratulations!', [], $options);
+    $message['body'][] = t('Drupal core was automatically updated from @previous_version to @updated_version.', [
+      '@previous_version' => $params['previous_version'],
+      '@updated_version' => $params['updated_version'],
+    ], $options);
+  }
+  elseif (str_starts_with($key, 'cron_failed')) {
+    $message['subject'] = t("Drupal core update failed", [], $options);
 
-    case 'cron_failed':
-      $message['subject'] = t("Drupal core update failed", [], $options);
-      $message['body'][] = t('Drupal core failed to update automatically from @previous_version to @target_version. The following error was logged:', [
-        '@previous_version' => $params['previous_version'],
-        '@target_version' => $params['target_version'],
+    // If this is considered urgent, prefix the subject line with a call to
+    // action.
+    if ($params['urgent']) {
+      $message['subject'] = t('URGENT: @subject', [
+        '@subject' => $message['subject'],
       ], $options);
-      $message['body'][] = $params['error_message'];
-      break;
+    }
+
+    $message['body'][] = t('Drupal core failed to update automatically from @previous_version to @target_version. The following error was logged:', [
+      '@previous_version' => $params['previous_version'],
+      '@target_version' => $params['target_version'],
+    ], $options);
+    $message['body'][] = $params['error_message'];
+
+    // If the problem was not due to a failed apply, provide a link for the site
+    // owner to do the update.
+    if ($key !== 'cron_failed_apply') {
+      $url = Url::fromRoute('update.report_update')
+        ->setAbsolute()
+        ->toString();
+
+      if ($key === 'cron_failed_insecure') {
+        $message['body'][] = t('Your site is running an insecure version of Drupal and should be updated as soon as possible. Visit @url to perform the update.', ['@url' => $url], $options);
+      }
+      else {
+        $message['body'][] = t('No immediate action is needed, but it is recommended that you visit @url to perform the update, or at least check that everything still looks good.', ['@url' => $url], $options);
+      }
+    }
+  }
+  elseif ($key === 'status_check_failed') {
+    $message['subject'] = t('Automatic updates readiness checks failed', [], $options);
+
+    $url = Url::fromRoute('system.status')
+      ->setAbsolute()
+      ->toString();
+    $message['body'][] = t('Your site has failed some readiness checks for automatic updates and may not be able to receive automatic updates until further action is taken. Please visit @url for more information.', [
+      '@url' => $url,
+    ], $options);
   }
 
   // If this email was related to an unattended update, explicitly state that
@@ -74,9 +119,9 @@ function automatic_updates_mail(string $key, array &$message, array $params): vo
  * Implements hook_page_top().
  */
 function automatic_updates_page_top() {
-  /** @var \Drupal\automatic_updates\Validation\AdminReadinessMessages $readiness_messages */
-  $readiness_messages = \Drupal::classResolver(AdminReadinessMessages::class);
-  $readiness_messages->displayAdminPageMessages();
+  /** @var \Drupal\automatic_updates\Validation\AdminStatusCheckMessages $status_check_messages */
+  $status_check_messages = \Drupal::classResolver(AdminStatusCheckMessages::class);
+  $status_check_messages->displayAdminPageMessages();
 
   // @todo Rely on the route option after https://www.drupal.org/i/3236497 is
   //   committed.
@@ -109,7 +154,6 @@ function automatic_updates_module_implements_alter(&$implementations, $hook) {
     unset($implementations['update']);
   }
   if ($hook === 'cron') {
-    // Whatever mofo.
     $hook = $implementations['automatic_updates'];
     unset($implementations['automatic_updates']);
     $implementations['automatic_updates'] = $hook;
@@ -120,85 +164,47 @@ function automatic_updates_module_implements_alter(&$implementations, $hook) {
  * Implements hook_cron().
  */
 function automatic_updates_cron() {
-  \Drupal::service('automatic_updates.cron_updater')->handleCron();
+  /** @var \Drupal\automatic_updates\CronUpdater $updater */
+  $updater = \Drupal::service('automatic_updates.cron_updater');
+  $updater->handleCron();
 
-  /** @var \Drupal\automatic_updates\Validation\ReadinessValidationManager $checker_manager */
-  $checker_manager = \Drupal::service('automatic_updates.readiness_validation_manager');
-  $last_results = $checker_manager->getResults();
-  $last_run_time = $checker_manager->getLastRunTime();
-  // Do not run readiness checks more than once an hour unless there are no
-  // results available.
+  /** @var \Drupal\automatic_updates\Validation\StatusChecker $status_checker */
+  $status_checker = \Drupal::service('automatic_updates.status_checker');
+  $last_results = $status_checker->getResults();
+  $last_run_time = $status_checker->getLastRunTime();
+  // Do not run status checks more than once an hour unless there are no results
+  // available.
   if ($last_results === NULL || !$last_run_time || \Drupal::time()->getRequestTime() - $last_run_time > 3600) {
-    $checker_manager->run();
+    $status_checker->run();
   }
 
+  // Only try to send failure notifications if unattended updates are enabled.
+  if ($updater->getMode() !== CronUpdater::DISABLED) {
+    \Drupal::service('automatic_updates.status_check_mailer')
+      ->sendFailureNotifications($last_results, $status_checker->getResults());
+  }
 }
 
 /**
  * Implements hook_modules_installed().
  */
 function automatic_updates_modules_installed() {
-  // Run the readiness checkers if needed when any modules are installed in
-  // case they provide readiness checker services.
-  /** @var \Drupal\automatic_updates\Validation\ReadinessValidationManager $checker_manager */
-  $checker_manager = \Drupal::service('automatic_updates.readiness_validation_manager');
-  $checker_manager->run();
+  // Run the status checkers if needed when any modules are installed in
+  // case they provide status checkers.
+  /** @var \Drupal\automatic_updates\Validation\StatusChecker $status_checker */
+  $status_checker = \Drupal::service('automatic_updates.status_checker');
+  $status_checker->run();
 }
 
 /**
  * Implements hook_modules_uninstalled().
  */
 function automatic_updates_modules_uninstalled() {
-  // Run the readiness checkers if needed when any modules are uninstalled in
-  // case they provided readiness checker services.
-  /** @var \Drupal\automatic_updates\Validation\ReadinessValidationManager $checker_manager */
-  $checker_manager = \Drupal::service('automatic_updates.readiness_validation_manager');
-  $checker_manager->run();
-}
-
-/**
- * Implements hook_form_FORM_ID_alter() for 'update_manager_update_form'.
- */
-function automatic_updates_form_update_manager_update_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  // Remove current message that core updates are not supported with a link to
-  // use this module's form. The local task to 'update_manager_update_form' is
-  // replaced by our own from but this original form would still accessible via
-  // by its original URL.
-  if (isset($form['manual_updates']['#rows']['drupal']['data']['title'])) {
-    $current_route = \Drupal::routeMatch()->getRouteName();
-    if ($current_route === 'update.module_update') {
-      $redirect_route = 'automatic_updates.module_update';
-    }
-    elseif ($current_route === 'update.report_update') {
-      $redirect_route = 'automatic_updates.report_update';
-    }
-    if (!empty($redirect_route)) {
-      $core_updates_message = t(
-        '<h2>Core updates required</h2>Drupal core updates are supported by the enabled <a href="@url">Automatic Updates module</a>',
-        ['@url' => Url::fromRoute($redirect_route)->toString()]
-      );
-      $form['manual_updates']['#prefix'] = $core_updates_message;
-    }
-  }
-}
-
-/**
- * Implements hook_local_tasks_alter().
- */
-function automatic_updates_local_tasks_alter(array &$local_tasks) {
-  // The Update module's update form only allows updating modules and themes
-  // via archive files, which could produce unexpected results on a site using
-  // our Composer-based updater.
-  $new_routes = [
-    'update.report_update' => 'automatic_updates.report_update',
-    'update.module_update' => 'automatic_updates.module_update',
-    'update.theme_update' => 'automatic_updates.theme_update',
-  ];
-  foreach ($new_routes as $local_task_id => $new_route) {
-    if (!empty($local_tasks[$local_task_id])) {
-      $local_tasks[$local_task_id]['route_name'] = $new_route;
-    }
-  }
+  // Run the status checkers if needed when any modules are uninstalled in
+  // case they provided status checkers.
+  /** @var \Drupal\automatic_updates\Validation\StatusChecker $status_checker */
+  $status_checker = \Drupal::service('automatic_updates.status_checker');
+  $status_checker->run();
 }
 
 /**
@@ -248,7 +254,7 @@ function automatic_updates_preprocess_update_project_status(array &$variables) {
       '#markup' => t(
         '@label <a href=":update-form">Update now</a>', [
           '@label' => $status['label'],
-          ':update-form' => Url::fromRoute('automatic_updates.report_update')->toString(),
+          ':update-form' => Url::fromRoute('update.report_update')->toString(),
         ]),
     ];
   }
@@ -259,7 +265,7 @@ function automatic_updates_preprocess_update_project_status(array &$variables) {
   foreach ($variables['versions'] as &$themed_version) {
     $version_info = &$themed_version['#version'];
     if ($supported_target_versions && in_array($version_info['version'], $supported_target_versions, TRUE)) {
-      $version_info['download_link'] = Url::fromRoute('automatic_updates.report_update')->setAbsolute()->toString();
+      $version_info['download_link'] = Url::fromRoute('update.report_update')->setAbsolute()->toString();
     }
     else {
       // If this version will not be displayed as an option on this module's

automatic_updates.post_update.php

+<?php
+
+/**
+ * @file
+ * Contains post-update hooks for Automatic Updates.
+ */
+
+use Drupal\automatic_updates\StatusCheckMailer;
+
+/**
+ * Creates the automatic_updates.settings:status_check_mail config.
+ */
+function automatic_updates_post_update_create_status_check_mail_config(): void {
+  \Drupal::configFactory()
+    ->getEditable('automatic_updates.settings')
+    ->set('status_check_mail', StatusCheckMailer::ERRORS_ONLY)
+    ->save();
+}

automatic_updates.routing.yml

-automatic_updates.update_readiness:
-  path: '/admin/automatic_updates/readiness'
+automatic_updates.status_check:
+  path: '/admin/automatic_updates/status'
   defaults:
-    _controller: '\Drupal\automatic_updates\Controller\ReadinessCheckerController::run'
+    _controller: '\Drupal\automatic_updates\Controller\StatusCheckController::run'
     _title: 'Update readiness checking'
   requirements:
     _permission: 'administer software updates'
   options:
     _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _automatic_updates_status_messages: skip
 automatic_updates.confirmation_page:
   path: '/admin/automatic-update-ready/{stage_id}'
   defaults:
@@ -17,7 +17,7 @@ automatic_updates.confirmation_page:
     _permission: 'administer software updates'
   options:
     _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _automatic_updates_status_messages: skip
 automatic_updates.finish:
   path: '/automatic-update/finish'
   defaults:
@@ -26,45 +26,43 @@ automatic_updates.finish:
     _permission: 'administer software updates'
   options:
     _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _automatic_updates_status_messages: skip
 automatic_updates.cron.post_apply:
   path: '/automatic-update/cron/post-apply/{stage_id}/{installed_version}/{target_version}/{key}'
   defaults:
     _controller: 'automatic_updates.cron_updater:handlePostApply'
   requirements:
     _access_system_cron: 'TRUE'
-# Links to our updater form appear in three different sets of local tasks. To ensure the breadcrumbs and paths are
-# consistent with the other local tasks in each set, we need two separate routes to the same form.
+
+# These routes are deprecated and will be removed in the next major version of
+# Automatic Updates. They redirect to existing routes from the core Update
+# module, which are overridden by Automatic Updates.
+# @see \Drupal\automatic_updates\Routing\RouteSubscriber::alterRoutes()
 automatic_updates.report_update:
   path: '/admin/reports/updates/automatic-update'
   defaults:
-    _form: '\Drupal\automatic_updates\Form\UpdaterForm'
-    _title: 'Update'
+    _controller: '\Drupal\automatic_updates\Controller\UpdateController::redirectDeprecatedRoute'
   requirements:
-    _permission: 'administer software updates'
-  options:
-    _admin_route: TRUE
-    _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _access: 'TRUE'
 automatic_updates.module_update:
   path: '/admin/modules/automatic-update'
   defaults:
-    _form: '\Drupal\automatic_updates\Form\UpdaterForm'
-    _title: 'Update'
+    _controller: '\Drupal\automatic_updates\Controller\UpdateController::redirectDeprecatedRoute'
   requirements:
-    _permission: 'administer software updates'
-  options:
-    _admin_route: TRUE
-    _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _access: 'TRUE'
 automatic_updates.theme_update:
   path: '/admin/theme/automatic-update'
   defaults:
-    _form: '\Drupal\automatic_updates\Form\UpdaterForm'
-    _title: 'Update'
+    _controller: '\Drupal\automatic_updates\Controller\UpdateController::redirectDeprecatedRoute'
+  requirements:
+    _access: 'TRUE'
+automatic_updates.update_readiness:
+  path: '/admin/automatic_updates/readiness'
+  defaults:
+    _controller: '\Drupal\automatic_updates\Controller\StatusCheckController::runReadiness'
+    _title: 'Update readiness checking'
   requirements:
     _permission: 'administer software updates'
   options:
-    _admin_route: TRUE
     _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _automatic_updates_status_messages: skip

automatic_updates.services.yml

@@ -3,8 +3,8 @@ services:
     class: Drupal\automatic_updates\Routing\RouteSubscriber
     tags:
       - { name: event_subscriber }
-  automatic_updates.readiness_validation_manager:
-    class: Drupal\automatic_updates\Validation\ReadinessValidationManager
+  automatic_updates.status_checker:
+    class: Drupal\automatic_updates\Validation\StatusChecker
     arguments:
       - '@keyvalue.expirable'
       - '@datetime.time'
@@ -14,6 +14,17 @@ services:
       - 24
     tags:
       - { name: event_subscriber }
+  automatic_updates.status_check_mailer:
+    class: Drupal\automatic_updates\StatusCheckMailer
+    arguments:
+      - '@config.factory'
+      - '@plugin.manager.mail'
+      - '@language_manager'
+  automatic_updates.readiness_validation_manager:
+    class: Drupal\automatic_updates\Validation\ReadinessValidationManager
+    arguments:
+      - '@automatic_updates.status_checker'
+    deprecated: The "%service_id%" service is deprecated in automatic_updates:8.x-2.5 and is removed from automatic_updates:3.0.0. Use the automatic_updates.status_checker service instead. See https://www.drupal.org/node/3316086.
   automatic_updates.updater:
     class: Drupal\automatic_updates\Updater
     arguments:
@@ -36,7 +47,7 @@ services:
       - '@automatic_updates.release_chooser'
       - '@logger.factory'
       - '@plugin.manager.mail'
-      - '@language_manager'
+      - '@automatic_updates.status_check_mailer'
       - '@state'
       - '@config.factory'
       - '@package_manager.path_locator'
@@ -61,60 +72,6 @@ services:
     class: Drupal\automatic_updates\ReleaseChooser
     arguments:
       - '@automatic_updates.validator.version_policy'
-  automatic_updates.composer_executable_validator:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.composer_executable'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.settings_validator:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.settings'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.composer_settings:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.composer_settings'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.disk_space_validator:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.disk_space'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.pending_updates_validator:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.pending_updates'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.file_system_permissions:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.file_system'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.multisite:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.multisite'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.symlink:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.symlink'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.patches:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.patches'
-    tags:
-      - { name: event_subscriber }
   automatic_updates.cron_frequency_validator:
     class: Drupal\automatic_updates\Validator\CronFrequencyValidator
     arguments:
@@ -135,6 +92,8 @@ services:
       - { name: event_subscriber }
   automatic_updates.validator.xdebug:
     class: Drupal\automatic_updates\Validator\XdebugValidator
+    arguments:
+      - '@package_manager.validator.xdebug'
     tags:
       - { name: event_subscriber }
   automatic_updates.validator.version_policy:
@@ -145,6 +104,8 @@ services:
       - { name: event_subscriber }
   automatic_updates.config_subscriber:
     class: Drupal\automatic_updates\EventSubscriber\ConfigSubscriber
+    arguments:
+      - '@automatic_updates.status_checker'
     tags:
       - { name: event_subscriber }
   automatic_updates.validator.scaffold_file_permissions:
@@ -158,6 +119,7 @@ services:
     arguments:
       - '@request_stack'
       - '@config.factory'
+      - '@module_handler'
     tags:
       - { name: event_subscriber }
   logger.channel.automatic_updates:

automatic_updates_extensions/automatic_updates_extensions.routing.yml

@@ -7,7 +7,7 @@ automatic_updates_extensions.report_update:
     _permission: 'administer software updates'
   options:
     _admin_route: TRUE
-    _automatic_updates_readiness_messages: skip
+    _automatic_updates_status_messages: skip
 
 automatic_updates_extensions.module_update:
   path: '/admin/modules/automatic-update-extensions'
@@ -19,7 +19,7 @@ automatic_updates_extensions.module_update:
   options:
     _admin_route: TRUE
     _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _automatic_updates_status_messages: skip
 
 automatic_updates_extension.theme_update:
   path: '/admin/appearance/automatic-update-extensions'
@@ -31,7 +31,7 @@ automatic_updates_extension.theme_update:
   options:
     _admin_route: TRUE
     _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _automatic_updates_status_messages: skip
 
 automatic_updates_extension.confirmation_page:
   path: '/admin/automatic-update-extensions-ready/{stage_id}'
@@ -43,4 +43,4 @@ automatic_updates_extension.confirmation_page:
   options:
     _admin_route: TRUE
     _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
+    _automatic_updates_status_messages: skip

automatic_updates_extensions/src/BatchProcessor.php

@@ -117,6 +117,15 @@ final class BatchProcessor {
   public static function commit(string $stage_id, array &$context): void {
     try {
       static::getUpdater()->claim($stage_id)->apply();
+      // The batch system does not allow any single request to run for longer
+      // than a second, so this will force the next operation to be done in a
+      // new request. This helps keep the running code in as consistent a state
+      // as possible.
+      // @see \Drupal\package_manager\Stage::apply()
+      // @see \Drupal\package_manager\Stage::postApply()
+      // @todo See if there's a better way to ensure the post-apply tasks run
+      //   in a new request in https://www.drupal.org/i/3293150.
+      sleep(1);
     }
     catch (\Throwable $e) {
       static::handleException($e, $context);

automatic_updates_extensions/src/ExtensionUpdater.php

@@ -108,7 +108,7 @@ class ExtensionUpdater extends Stage {
       parent::dispatch($event, $on_error);
     }
     catch (StageValidationException $e) {
-      throw new UpdateException($e->getResults(), $e->getMessage() ?: "Unable to complete the update because of errors.", $e->getCode(), $e);
+      throw new UpdateException($e->getResults(), $e->getMessage(), $e->getCode(), $e);
     }
   }
 

automatic_updates_extensions/src/Form/UpdateReady.php

@@ -2,15 +2,15 @@
 
 namespace Drupal\automatic_updates_extensions\Form;
 
+use Drupal\automatic_updates\Form\UpdateFormBase;
 use Drupal\package_manager\Exception\ApplyFailedException;
 use Drupal\package_manager\ProjectInfo;
-use Drupal\package_manager\Validator\StagedDBUpdateValidator;
+use Drupal\package_manager\ValidationResult;
 use Drupal\automatic_updates_extensions\BatchProcessor;
 use Drupal\automatic_updates\BatchProcessor as AutoUpdatesBatchProcessor;
 use Drupal\automatic_updates_extensions\ExtensionUpdater;
 use Drupal\Core\Batch\BatchBuilder;
 use Drupal\Core\Extension\ModuleExtensionList;
-use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Messenger\MessengerInterface;
@@ -18,7 +18,9 @@ use Drupal\Core\State\StateInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\package_manager\Exception\StageException;
 use Drupal\package_manager\Exception\StageOwnershipException;
+use Drupal\system\SystemManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Defines a form to commit staged updates.
@@ -26,7 +28,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * @internal
  *   Form classes are internal.
  */
-final class UpdateReady extends FormBase {
+final class UpdateReady extends UpdateFormBase {
 
   /**
    * The updater service.
@@ -50,18 +52,18 @@ final class UpdateReady extends FormBase {
   protected $moduleList;
 
   /**
-   * The staged database update validator service.
+   * The renderer service.
    *
-   * @var \Drupal\package_manager\Validator\StagedDBUpdateValidator
+   * @var \Drupal\Core\Render\RendererInterface
    */
-  protected $stagedDatabaseUpdateValidator;
+  protected $renderer;
 
   /**
-   * The renderer service.
+   * The event dispatcher.
    *
-   * @var \Drupal\Core\Render\RendererInterface
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
    */
-  protected $renderer;
+  protected $eventDispatcher;
 
   /**
    * Constructs a new UpdateReady object.
@@ -74,18 +76,18 @@ final class UpdateReady extends FormBase {
    *   The state service.
    * @param \Drupal\Core\Extension\ModuleExtensionList $module_list
    *   The module list service.
-   * @param \Drupal\package_manager\Validator\StagedDBUpdateValidator $staged_database_update_validator
-   *   The staged database update validator service.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer service.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
+   *   Event dispatcher service.
    */
-  public function __construct(ExtensionUpdater $updater, MessengerInterface $messenger, StateInterface $state, ModuleExtensionList $module_list, StagedDBUpdateValidator $staged_database_update_validator, RendererInterface $renderer) {
+  public function __construct(ExtensionUpdater $updater, MessengerInterface $messenger, StateInterface $state, ModuleExtensionList $module_list, RendererInterface $renderer, EventDispatcherInterface $event_dispatcher) {
     $this->updater = $updater;
     $this->setMessenger($messenger);
     $this->state = $state;
     $this->moduleList = $module_list;
-    $this->stagedDatabaseUpdateValidator = $staged_database_update_validator;
     $this->renderer = $renderer;
+    $this->eventDispatcher = $event_dispatcher;
   }
 
   /**
@@ -104,8 +106,8 @@ final class UpdateReady extends FormBase {
       $container->get('messenger'),
       $container->get('state'),
       $container->get('extension.list.module'),
-      $container->get('package_manager.validator.staged_database_updates'),
-      $container->get('renderer')
+      $container->get('renderer'),
+      $container->get('event_dispatcher')
     );
   }
 
@@ -127,23 +129,6 @@ final class UpdateReady extends FormBase {
 
     $messages = [];
 
-    // If there are any installed extension with database updates in the staging
-    // area, warn the user that they might be sent to update.php once the staged
-    // changes have been applied.
-    $pending_updates = $this->stagedDatabaseUpdateValidator->getExtensionsWithDatabaseUpdates($this->updater);
-    if ($pending_updates) {
-      natcasesort($pending_updates);
-      $message_item_list = [
-        '#theme' => 'item_list',
-        '#prefix' => '<p>' . $this->t('Possible database updates were detected in the following extensions; you may be redirected to the database update page in order to complete the update process.') . '</p>',
-        '#items' => $pending_updates,
-        '#context' => [
-          'list_style' => 'automatic-updates-extensions__pending-database-updates',
-        ],
-      ];
-      $messages[MessengerInterface::TYPE_WARNING][] = $this->renderer->renderRoot($message_item_list);
-    }
-
     // Don't set any messages if the form has been submitted, because we don't
     // want them to be set during form submit.
     if (!$form_state->getUserInput()) {
@@ -177,6 +162,18 @@ final class UpdateReady extends FormBase {
       '#type' => 'checkbox',
       '#default_value' => TRUE,
     ];
+
+    // Don't run the status checks once the form has been submitted.
+    if (!$form_state->getUserInput()) {
+      $results = $this->runStatusCheck($this->updater, $this->eventDispatcher);
+      // This will have no effect if $results is empty.
+      $this->displayResults($results, $this->renderer);
+      // If any errors occurred, return the form early so the user cannot
+      // continue.
+      if (ValidationResult::getOverallSeverity($results) === SystemManager::REQUIREMENT_ERROR) {
+        return $form;
+      }
+    }
     $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Continue'),

automatic_updates_extensions/src/Form/UpdaterForm.php

@@ -2,12 +2,10 @@
 
 namespace Drupal\automatic_updates_extensions\Form;
 
-use Drupal\automatic_updates\Event\ReadinessCheckEvent;
-use Drupal\automatic_updates\Validation\ReadinessTrait;
+use Drupal\automatic_updates\Form\UpdateFormBase;
 use Drupal\automatic_updates_extensions\BatchProcessor;
 use Drupal\automatic_updates_extensions\ExtensionUpdater;
 use Drupal\Core\Batch\BatchBuilder;
-use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Messenger\MessengerInterface;
@@ -16,6 +14,7 @@ use Drupal\Core\Url;
 use Drupal\package_manager\Exception\ApplyFailedException;
 use Drupal\package_manager\FailureMarker;
 use Drupal\package_manager\ProjectInfo;
+use Drupal\package_manager\ValidationResult;
 use Drupal\system\SystemManager;
 use Drupal\update\UpdateManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -27,9 +26,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  * @internal
  *   Form classes are internal.
  */
-final class UpdaterForm extends FormBase {
-
-  use ReadinessTrait;
+final class UpdaterForm extends UpdateFormBase {
 
   /**
    * The extension updater service.
@@ -165,12 +162,10 @@ final class UpdaterForm extends FormBase {
       $results = [];
     }
     else {
-      $event = new ReadinessCheckEvent($this->extensionUpdater);
-      $this->eventDispatcher->dispatch($event);
-      $results = $event->getResults();
+      $results = $this->runStatusCheck($this->extensionUpdater, $this->eventDispatcher, TRUE);
     }
-    $this->displayResults($results, $this->messenger(), $this->renderer);
-    $security_level = $this->getOverallSeverity($results);
+    $this->displayResults($results, $this->renderer);
+    $security_level = ValidationResult::getOverallSeverity($results);
 
     if ($update_projects && $security_level !== SystemManager::REQUIREMENT_ERROR) {
       $form['actions'] = $this->actions($form_state);

automatic_updates_extensions/src/Validator/UpdateReleaseValidator.php

@@ -103,7 +103,7 @@ final class UpdateReleaseValidator implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       PreCreateEvent::class => 'checkRelease',
     ];

automatic_updates_extensions/tests/modules/automatic_updates_extensions_test_api/automatic_updates_extensions_test_api.info.yml

@@ -4,3 +4,4 @@ type: module
 package: Testing
 dependencies:
   - automatic_updates:automatic_updates_extensions
+  - automatic_updates:package_manager_test_api

automatic_updates_extensions/tests/modules/automatic_updates_extensions_test_api/automatic_updates_extensions_test_api.routing.yml

@@ -4,3 +4,9 @@ automatic_updates_extensions_test_api:
     _controller: 'Drupal\automatic_updates_extensions_test_api\ApiController::run'
   requirements:
     _access: 'TRUE'
+automatic_updates_extensions_test_api.finish:
+  path: '/automatic-updates-extensions-test-api/finish/{id}'
+  defaults:
+    _controller: 'Drupal\automatic_updates_extensions_test_api\ApiController::finish'
+  requirements:
+    _access: 'TRUE'

automatic_updates_extensions/tests/modules/automatic_updates_extensions_test_api/src/ApiController.php

@@ -2,45 +2,19 @@
 
 namespace Drupal\automatic_updates_extensions_test_api;
 
-use Drupal\automatic_updates_extensions\ExtensionUpdater;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\package_manager\PathLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Drupal\package_manager_test_api\ApiController as PackageManagerApiController;
 
 /**
  * Provides API endpoints to interact with a staging area in functional tests.
  */
-class ApiController extends ControllerBase {
-
-
-  /**
-   * The extension updater.
-   *
-   * @var \Drupal\automatic_updates_extensions\ExtensionUpdater
-   */
-  private $extensionUpdater;
+class ApiController extends PackageManagerApiController {
 
   /**
-   * The path locator service.
-   *
-   * @var \Drupal\package_manager\PathLocator
-   */
-  private $pathLocator;
-
-  /**
-   * Constructs an ApiController object.
-   *
-   * @param \Drupal\automatic_updates_extensions\ExtensionUpdater $extension_updater
-   *   The updater.
-   * @param \Drupal\package_manager\PathLocator $path_locator
-   *   The path locator service.
+   * {@inheritdoc}
    */
-  public function __construct(ExtensionUpdater $extension_updater, PathLocator $path_locator) {
-    $this->extensionUpdater = $extension_updater;
-    $this->pathLocator = $path_locator;
-  }
+  protected $finishedRoute = 'automatic_updates_extensions_test_api.finish';
 
   /**
    * {@inheritdoc}
@@ -53,36 +27,13 @@ class ApiController extends ControllerBase {
   }
 
   /**
-   * Runs a complete stage life cycle.
-   *
-   * Creates a staging area, requires packages into it, applies changes to the
-   * active directory, and destroys the stage.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request. The runtime and dev dependencies are expected to be in
-   *   either the query string or request body, under the 'runtime' and 'dev'
-   *   keys, respectively. There may also be a 'files_to_return' key, which
-   *   contains an array of file paths, relative to the project root, whose
-   *   contents should be returned in the response.
-   *
-   * @return \Symfony\Component\HttpFoundation\JsonResponse
-   *   A JSON response containing an associative array of the contents of the
-   *   files listed in the 'files_to_return' request key. The array will be
-   *   keyed by path, relative to the project root.
+   * {@inheritdoc}
    */
-  public function run(Request $request): JsonResponse {
-    $this->extensionUpdater->begin($request->get('projects', []));
-    $this->extensionUpdater->stage();
-    $this->extensionUpdater->apply();
-    $this->extensionUpdater->postApply();
-    $this->extensionUpdater->destroy();
-
-    $dir = $this->pathLocator->getProjectRoot();
-    $file_contents = [];
-    foreach ($request->get('files_to_return', []) as $path) {
-      $file_contents[$path] = file_get_contents($dir . '/' . $path);
-    }
-    return new JsonResponse($file_contents);
+  protected function createAndApplyStage(Request $request): string {
+    $id = $this->stage->begin($request->get('projects', []));
+    $this->stage->stage();
+    $this->stage->apply();
+    return $id;
   }
 
 }

automatic_updates_extensions/tests/src/Build/ModuleUpdateTest.php

@@ -21,7 +21,7 @@ class ModuleUpdateTest extends UpdateTestBase {
   protected function createTestProject(string $template): void {
     parent::createTestProject($template);
     $this->setReleaseMetadata([
-      'drupal' => __DIR__ . '/../../../../tests/fixtures/release-history/drupal.9.8.1-security.xml',
+      'drupal' => __DIR__ . '/../../../../package_manager/tests/fixtures/release-history/drupal.9.8.1-security.xml',
       'alpha'  => __DIR__ . '/../../fixtures/release-history/alpha.1.1.0.xml',
       'new_module' => __DIR__ . '/../../fixtures/release-history/new_module.1.1.0.xml',
     ]);

automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php

@@ -2,13 +2,14 @@
 
 namespace Drupal\Tests\automatic_updates_extensions\Functional;
 
-use Drupal\automatic_updates\Event\ReadinessCheckEvent;
 use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
 use Drupal\package_manager_test_validation\StagedDatabaseUpdateValidator;
 use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\Event\StatusCheckEvent;
 use Drupal\package_manager\ValidationResult;
 use Drupal\package_manager_bypass\Committer;
 use Drupal\package_manager_bypass\Stager;
+use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
 use Drupal\Tests\automatic_updates\Functional\AutomaticUpdatesFunctionalTestBase;
 use Drupal\Tests\automatic_updates\Traits\ValidationTestTrait;
 use Drupal\Tests\automatic_updates_extensions\Traits\FormTestTrait;
@@ -192,11 +193,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     // Ensure that a list of pending database updates is visible, along with a
     // short explanation, in the warning messages.
     $warning_messages = $assert_session->elementExists('xpath', '//div[@data-drupal-messages]//div[@aria-label="Warning message"]');
-    $this->assertStringContainsString('Possible database updates were detected in the following extensions; you may be redirected to the database update page in order to complete the update process.', $warning_messages->getText());
-    $pending_updates = $warning_messages->findAll('css', 'ul.item-list__automatic-updates-extensions__pending-database-updates li');
-    $this->assertCount(2, $pending_updates);
-    $this->assertSame('Automatic Updates Theme With Updates', $pending_updates[0]->getText());
-    $this->assertSame('System', $pending_updates[1]->getText());
+    $this->assertStringContainsString('Possible database updates have been detected in the following extensions.<ul><li>System</li><li>Automatic Updates Theme With Updates</li></ul>', $warning_messages->getHtml());
 
     $page->pressButton('Continue');
     $this->checkForMetaRefresh();
@@ -207,6 +204,14 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session->pageTextContainsOnce('Update complete!');
     // Confirm the site was returned to the original maintenance mode state.
     $this->assertSame($state->get('system.maintenance_mode'), $maintenance_mode_on);
+    // Confirm that the apply and post-apply operations happened in
+    // separate requests.
+    // @see \Drupal\automatic_updates_test\EventSubscriber\RequestTimeRecorder
+    $pre_apply_time = $state->get('Drupal\package_manager\Event\PreApplyEvent time');
+    $post_apply_time = $state->get('Drupal\package_manager\Event\PostApplyEvent time');
+    $this->assertNotEmpty($pre_apply_time);
+    $this->assertNotEmpty($post_apply_time);
+    $this->assertNotSame($pre_apply_time, $post_apply_time);
   }
 
   /**
@@ -426,7 +431,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->assertUpdatesCount(1);
     $message = t("You've not experienced Shakespeare until you have read him in the original Klingon.");
     $error = ValidationResult::createError([$message]);
-    TestSubscriber1::setTestResult([$error], ReadinessCheckEvent::class);
+    TestSubscriber1::setTestResult([$error], StatusCheckEvent::class);
     $this->getSession()->reload();
     $assert->pageTextContains($message);
     $assert->pageTextContains(static::$errorsExplanation);
@@ -444,15 +449,69 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->checkForUpdates();
     $message = t("Warning! Updating this module may cause an error.");
     $warning = ValidationResult::createWarning([$message]);
-    TestSubscriber1::setTestResult([$warning], ReadinessCheckEvent::class);
+    TestSubscriber1::setTestResult([$warning], StatusCheckEvent::class);
     // Navigate to the automatic updates form.
     $this->drupalGet('/admin/reports/updates');
     $this->clickLink('Update Extensions');
     $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
     $this->assertUpdatesCount(1);
-    $assert->pageTextContains(static::$warningsExplanation);
+    $this->checkForMetaRefresh();
     $assert->pageTextNotContains(static::$errorsExplanation);
+    $assert->elementExists('css', '#edit-projects-semver-test')->check();
+    $assert->checkboxChecked('edit-projects-semver-test');
+    $assert->pageTextContains(static::$warningsExplanation);
     $assert->buttonExists('Update');
+
+    // Add warnings from StatusCheckEvent.
+    $summary_status_check_event = t('Some summary');
+    $messages_status_check_event = [
+      "The only thing we're allowed to do is to",
+      "believe that we won't regret the choice",
+      "we made.",
+    ];
+    $warning_status_check_event = ValidationResult::createWarning($messages_status_check_event, $summary_status_check_event);
+    TestSubscriber::setTestResult([$warning_status_check_event], StatusCheckEvent::class);
+    $this->getSession()->getPage()->pressButton('Update');
+    $this->checkForMetaRefresh();
+    $assert->buttonExists('Continue');
+    $assert->pageTextContains($summary_status_check_event);
+    foreach ($messages_status_check_event as $message) {
+      $assert->pageTextContains($message);
+    }
+  }
+
+  /**
+   * Tests that messages from StatusCheckEvent are shown on the confirmation form.
+   */
+  public function testStatusErrorMessages(): void {
+    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
+    $assert = $this->assertSession();
+    $this->setProjectInstalledVersion(['semver_test' => '8.1.0']);
+    $this->checkForUpdates();
+    $this->drupalGet('admin/reports/updates/automatic-update-extensions');
+    $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
+    $this->assertUpdatesCount(1);
+    $this->getSession()->reload();
+    $assert->elementExists('css', '#edit-projects-semver-test')->check();
+    $assert->checkboxChecked('edit-projects-semver-test');
+    $assert->buttonExists('Update');
+    $messages = [
+      "The only thing we're allowed to do is to",
+      "believe that we won't regret the choice",
+      "we made.",
+    ];
+    $summary = t('Some summary');
+    $error = ValidationResult::createError($messages, $summary);
+    TestSubscriber::setTestResult([$error], StatusCheckEvent::class);
+    $this->getSession()->getPage()->pressButton('Update');
+    $this->checkForMetaRefresh();
+    $assert->pageTextContains(static::$errorsExplanation);
+    $assert->pageTextNotContains(static::$warningsExplanation);
+    $assert->pageTextContains($summary);
+    foreach ($messages as $message) {
+      $assert->pageTextContains($message);
+    }
+    $assert->buttonNotExists('Continue');
   }
 
   /**

automatic_updates_extensions/tests/src/Kernel/ExtensionUpdaterTest.php

@@ -2,7 +2,12 @@
 
 namespace Drupal\Tests\automatic_updates_extensions\Kernel;
 
-use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
+use Drupal\automatic_updates\Exception\UpdateException;
+use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
+use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\Event\PreCreateEvent;
+use Drupal\package_manager\Event\PreRequireEvent;
+use Drupal\package_manager\ValidationResult;
 use Drupal\Tests\user\Traits\UserCreationTrait;
 
 /**
@@ -10,7 +15,7 @@ use Drupal\Tests\user\Traits\UserCreationTrait;
  *
  * @group automatic_updates_extensions
  */
-class ExtensionUpdaterTest extends AutomaticUpdatesKernelTestBase {
+class ExtensionUpdaterTest extends AutomaticUpdatesExtensionsKernelTestBase {
 
   use UserCreationTrait;
 
@@ -146,4 +151,51 @@ class ExtensionUpdaterTest extends AutomaticUpdatesKernelTestBase {
     ]);
   }
 
+  /**
+   * Tests UpdateException handling.
+   *
+   * @param string $event_class
+   *   The stage life cycle event which should raise an error.
+   *
+   * @dataProvider providerUpdateException
+   */
+  public function testUpdateException(string $event_class): void {
+    $this->createVirtualProject(__DIR__ . '/../../fixtures/fake-site');
+    $extension_updater = $this->container->get('automatic_updates_extensions.updater');
+    $results = [
+      ValidationResult::createError(['An error of some sorts.']),
+    ];
+    TestSubscriber1::setTestResult($results, $event_class);
+    try {
+      $extension_updater->begin(['my_module' => '9.8.1']);
+      $extension_updater->stage();
+      $extension_updater->apply();
+      $this->fail('Expected an exception, but none was raised.');
+    }
+    catch (UpdateException $e) {
+      $this->assertStringStartsWith('An error of some sorts.', $e->getMessage());
+      $this->assertInstanceOf($event_class, $e->event);
+    }
+  }
+
+  /**
+   * Data provider for testUpdateException().
+   *
+   * @return string[][]
+   *   The test cases.
+   */
+  public function providerUpdateException(): array {
+    return [
+      'pre-create exception' => [
+        PreCreateEvent::class,
+      ],
+      'pre-require exception' => [
+        PreRequireEvent::class,
+      ],
+      'pre-apply exception' => [
+        PreApplyEvent::class,
+      ],
+    ];
+  }
+
 }

composer.json

@@ -13,7 +13,7 @@
   "require": {
     "ext-json": "*",
     "drupal/core": "^9.3",
-    "php-tuf/composer-stager": "^1.1",
+    "php-tuf/composer-stager": "^1.2",
     "composer/composer": "^2.2.12 || ^2.3.5",
     "composer-runtime-api": "^2.1",
     "symfony/config": "^4.4 || ^6.1",
@@ -31,11 +31,18 @@
     "test": [
       "Composer\\Config::disableProcessTimeout",
       "scripts/phpunit.sh"
-    ]
+    ],
+    "core-convert": "Drupal\\automatic_updates\\CoreCovert\\Converter::doConvert"
   },
   "scripts-descriptions": {
     "phpcbf": "Automatically fixes standards violations where possible.",
     "phpcs": "Checks code for standards compliance.",
-    "test": "Runs PHPUnit tests."
-  }
+    "test": "Runs PHPUnit tests.",
+    "core-convert": "Converts this module to a core merge request. Excepts 2 arguments. 1) The core clone directory. 2) The core merge request branch."
+  },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\automatic_updates\\CoreCovert\\": "scripts/src"
+        }
+    }
 }

config/install/automatic_updates.settings.yml

 cron: security
 allow_core_minor_updates: false
+status_check_mail: errors_only