.gitlab-ci.yml

+################
+# DrupalCI GitLabCI template
+#
+# Gitlab-ci.yml to replicate DrupalCI testing for Contrib
+#
+# With thanks to:
+#   * The GitLab Acceleration Initiative participants
+#   * DrupalSpoons
+################
+
+################
+# Guidelines
+#
+# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification. It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained.
+#
+# However, you can modify this template if you have additional needs for your project.
+################
+
+################
+# Includes
+#
+# Additional configuration can be provided through includes.
+# One advantage of include files is that if they are updated upstream, the changes affect all pipelines using that include.
+#
+# Includes can be overridden by re-declaring anything provided in an include, here in gitlab-ci.yml
+# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values
+################
+
+include:
+  ################
+  # DrupalCI includes:
+  # As long as you include this, any future includes added by the Drupal Association will be accessible to your pipelines automatically.
+  # View these include files at https://git.drupalcode.org/project/gitlab_templates/
+  ################
+  - project: $_GITLAB_TEMPLATES_REPO
+    # "ref" value can be:
+    # - Recommended (default) - `ref: $_GITLAB_TEMPLATES_REF` - The Drupal Association will update this value to the recommended tag for contrib.
+    # - Latest - `ref: main` - Get the latest additions and bug fixes as they are merged into the templates.
+    # - Minor or Major latests - `ref: 1.x-latest` or `ref: 1.0.x-latest` - Get the latest additions within a minor (mostly bugfixes) or major (bugs and new features).
+    # - Fixed tag - `ref: 1.0.1` - Set the value to a known tag. This will not get any updates.
+    # If you change the default value of ref, you should set the _CURL_TEMPLATES_REF variable in the variables section to be the same as set here.
+    ref: $_GITLAB_TEMPLATES_REF
+    file:
+      - '/includes/include.drupalci.main.yml'
+      # EXPERIMENTAL: For Drupal 7, remove the above line and uncomment the below.
+      # - '/includes/include.drupalci.main-d7.yml'
+      - '/includes/include.drupalci.variables.yml'
+      - '/includes/include.drupalci.workflows.yml'
+
+################
+# Pipeline configuration variables
+#
+# These are the variables provided to the Run Pipeline form that a user may want to override.
+#
+# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
+################
+variables:
+  _PHPUNIT_CONCURRENT: '1'
+  _PHPUNIT_TESTGROUPS: ''
+  # Always test against the previous minor version of core.
+  OPT_IN_TEST_PREVIOUS_MINOR: '1'
+  # @todo Remove this line when https://drupal.org/i/3414093 is fixed.
+  CI_DEBUG_SERVICES: "true"
+  _TARGET_DB_TYPE: "mariadb"
+  _TARGET_DB_VERSION: "10.6"
+  # Always show environment variables, to help in debugging CI problems.
+  _SHOW_ENVIRONMENT_VARIABLES: '1'
+
+
+###################################################################################
+#
+#                                        *
+#                                       /(
+#                                      ((((,
+#                                    /(((((((
+#                                   ((((((((((*
+#                                ,(((((((((((((((
+#                              ,(((((((((((((((((((
+#                            ((((((((((((((((((((((((*
+#                         *(((((((((((((((((((((((((((((
+#                       ((((((((((((((((((((((((((((((((((*
+#                    *((((((((((((((((((  .((((((((((((((((((
+#                  ((((((((((((((((((.       /(((((((((((((((((*
+#                /(((((((((((((((((            .(((((((((((((((((,
+#             ,((((((((((((((((((                 ((((((((((((((((((
+#           .((((((((((((((((((((                   .(((((((((((((((((
+#          (((((((((((((((((((((((                     ((((((((((((((((/
+#        (((((((((((((((((((((((((((/                    ,(((((((((((((((*
+#      .((((((((((((((/  /(((((((((((((.                   ,(((((((((((((((
+#     *((((((((((((((      ,(((((((((((((/                   *((((((((((((((.
+#    ((((((((((((((,          /(((((((((((((.                  ((((((((((((((,
+#   (((((((((((((/              ,(((((((((((((*                 ,(((((((((((((,
+#  *(((((((((((((                .(((((((((((((((                ,(((((((((((((
+#  ((((((((((((/                /((((((((((((((((((.              ,((((((((((((/
+# (((((((((((((              *(((((((((((((((((((((((*             *((((((((((((
+# (((((((((((((            ,(((((((((((((..(((((((((((((           *((((((((((((
+# ((((((((((((,          /((((((((((((*      /((((((((((((/         ((((((((((((
+# (((((((((((((        /((((((((((((/          (((((((((((((*       ((((((((((((
+# (((((((((((((/     /((((((((((((               ,((((((((((((,    *((((((((((((
+#  ((((((((((((((  *(((((((((((/                   *((((((((((((.  ((((((((((((/
+#  *((((((((((((((((((((((((((,                      /(((((((((((((((((((((((((
+#   (((((((((((((((((((((((((                         ((((((((((((((((((((((((,
+#   .(((((((((((((((((((((((/                         ,(((((((((((((((((((((((
+#     ((((((((((((((((((((((/                         ,(((((((((((((((((((((/
+#      *(((((((((((((((((((((                         (((((((((((((((((((((,
+#       ,(((((((((((((((((((((,                      ((((((((((((((((((((/
+#         ,(((((((((((((((((((((*                  /((((((((((((((((((((
+#            ((((((((((((((((((((((,           ,/((((((((((((((((((((,
+#              ,(((((((((((((((((((((((((((((((((((((((((((((((((((
+#                 .(((((((((((((((((((((((((((((((((((((((((((((
+#                     .((((((((((((((((((((((((((((((((((((,.
+#                          .,(((((((((((((((((((((((((.
+#
+###################################################################################
+
+.extra-variables: &extra-variables
+  - MODULE_DIR=$_WEB_ROOT/modules/custom/$CI_PROJECT_NAME
+  # Strip the `-dev` suffix out of $_TARGET_CORE to reveal the name of the Drupal core branch.
+  - CORE_BRANCH=`echo $_TARGET_CORE | sed -e "s/-dev$//"`
+
+composer:
+  extends: .composer-base
+  before_script:
+    # In this case, we want to archive everything.
+    - rm .gitattributes
+    - composer archive --file=module
+  after_script:
+    - *extra-variables
+    - rm -r -f $MODULE_DIR
+    - mkdir -p $MODULE_DIR
+    - tar -x -f module.tar -C $MODULE_DIR
+    - rm module.tar
+    - git clone https://git.drupalcode.org/project/drupal.git --depth 1 --branch $CORE_BRANCH /tmp/drupal-core
+    - cp -R /tmp/drupal-core/composer .
+    # Copy to web as well as \Drupal\Composer\Composer will expect it be there.
+    - cp -R /tmp/drupal-core/composer web
+
+composer (previous minor):
+  before_script:
+    - !reference [composer, before_script]
+  after_script:
+    - !reference [composer, after_script]
+
+composer (previous minor):
+  before_script:
+    - !reference [composer, before_script]
+  after_script:
+    - !reference [composer, after_script]
+
+phpcs:
+  before_script:
+    # Use core's PHPCS configuration.
+    - cp $_WEB_ROOT/core/phpcs.xml.dist .
+
+phpstan:
+  before_script:
+    - *extra-variables
+    # Ensure our PHPStan configuration has the correct include path to core's PHPStan configuration.
+    - sed -i "s#%rootDir%/../../../#%rootDir%/../../../$_WEB_ROOT/#" $MODULE_DIR/phpstan.neon
+
+phpunit:
+  parallel:
+    matrix:
+      - MODULE:
+          - automatic_updates_extensions
+          - automatic_updates
+          - package_manager
+        TEST_TYPE:
+          - Unit
+          - Kernel
+          - Functional
+          - FunctionalJavascript
+          - Build
+  rules:
+    # Automatic Updates Extensions has no unit or functional JavaScript tests.
+    - if: $MODULE == "automatic_updates_extensions" && ($TEST_TYPE == "Unit" || $TEST_TYPE == "FunctionalJavascript")
+      when: never
+    # Package Manager has no functional JavaScript tests.
+    - if: $MODULE == "package_manager" && $TEST_TYPE == "FunctionalJavascript"
+      when: never
+    - when: on_success
+  variables:
+    _PHPUNIT_EXTRA: '--types PHPUnit-$TEST_TYPE --module $MODULE'
+
+phpunit (previous minor):
+  rules:
+    - !reference [phpunit, rules]

README.md

@@ -11,7 +11,7 @@ Follow and read more on the [Automatic Updates Initiative overview and roadmap](
 
 Automatic Updates includes a sub-module, Automatic Updates Extensions, which supports updating contributed modules and themes.
 
-⚠️ ☢️️ **Automatic Updates Extensions is still experimental and under heavy development.** We encourage you to test it in your local development environment, or another low-stakes testing situation, but it is emphatically NOT ready for use in a production environment. ☢️ ⚠️
+⚠️ ☢️️ Depending on the contributed module or theme, updates to these projects could make the site inoperable. If possible, it is highly recommended that you test these updates in a development environment first.☢️ ⚠️
 
 ### More info
 

automatic_updates.info.yml

 name: 'Automatic Updates'
 type: module
 description: 'Automatically updates Drupal core.'
-core_version_requirement: ^10
+core_version_requirement: ^10.1
 dependencies:
   - drupal:package_manager
   - drupal:update

automatic_updates.install

@@ -7,7 +7,8 @@
 
 declare(strict_types = 1);
 
-use Drupal\automatic_updates\CronUpdateStage;
+use Drupal\automatic_updates\CronUpdateRunner;
+use Drupal\automatic_updates\UpdateStage;
 use Drupal\automatic_updates\Validation\StatusCheckRequirements;
 use Drupal\system\SystemManager;
 
@@ -15,7 +16,7 @@ use Drupal\system\SystemManager;
  * Implements hook_uninstall().
  */
 function automatic_updates_uninstall() {
-  \Drupal::service('automatic_updates.update_stage')->destroy(TRUE);
+  \Drupal::service(UpdateStage::class)->destroy(TRUE);
 }
 
 /**
@@ -30,7 +31,7 @@ function automatic_updates_requirements($phase) {
 
     // Check that site has cron updates enabled or not.
     // @todo Remove in https://www.drupal.org/project/automatic_updates/issues/3284443
-    if (\Drupal::configFactory()->get('automatic_updates.settings')->get('unattended.level') !== CronUpdateStage::DISABLED) {
+    if (\Drupal::configFactory()->get('automatic_updates.settings')->get('unattended.level') !== CronUpdateRunner::DISABLED) {
       $requirements['automatic_updates_cron'] = [
         'title' => t('Cron installs updates automatically'),
         'severity' => SystemManager::REQUIREMENT_WARNING,

automatic_updates.module

@@ -8,12 +8,16 @@
 declare(strict_types = 1);
 
 use Drupal\automatic_updates\BatchProcessor;
-use Drupal\automatic_updates\CronUpdateStage;
+use Drupal\automatic_updates\CronUpdateRunner;
+use Drupal\automatic_updates\ReleaseChooser;
+use Drupal\automatic_updates\UpdateStage;
+use Drupal\automatic_updates\Validation\StatusChecker;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\automatic_updates\Validation\AdminStatusCheckMessages;
 use Drupal\Core\Url;
 use Drupal\package_manager\ComposerInspector;
+use Drupal\Core\Utility\Error;
 use Drupal\system\Controller\DbUpdateController;
 
 /**
@@ -108,7 +112,7 @@ function automatic_updates_mail(string $key, array &$message, array $params): vo
   // If this email was related to an unattended update, explicitly state that
   // this isn't supported yet.
   if (str_starts_with($key, 'cron_')) {
-    $message['body'][] = t('This e-mail was sent by the Automatic Updates module. Unattended updates are not yet fully supported.', [], $options);
+    $message['body'][] = t('This email was sent by the Automatic Updates module. Unattended updates are not yet fully supported.', [], $options);
     $message['body'][] = t('If you are using this feature in production, it is strongly recommended for you to visit your site and ensure that everything still looks good.', [], $options);
   }
 }
@@ -116,7 +120,23 @@ function automatic_updates_mail(string $key, array &$message, array $params): vo
 /**
  * Implements hook_page_top().
  */
-function automatic_updates_page_top() {
+function automatic_updates_page_top(array &$page_top) {
+  // Ensure error messages will be displayed on the batch page.
+  // @todo Remove this work around when https://drupal.org/i/3406612 is fixed.
+  if (\Drupal::routeMatch()->getRouteName() === 'system.batch_page.html') {
+    // Directly render a status message placeholder without any messages.
+    // Messages are not intended to be show on the batch page, but in the event
+    // an error in a AJAX callback the messages will be displayed.
+    $page_top['messages'] = [
+      '#theme' => 'status_messages',
+      '#message_list' => [],
+      '#status_headings' => [
+        'status' => t('Status message'),
+        'error' => t('Error message'),
+        'warning' => t('Warning message'),
+      ],
+    ];
+  }
   /** @var \Drupal\automatic_updates\Validation\AdminStatusCheckMessages $status_check_messages */
   $status_check_messages = \Drupal::classResolver(AdminStatusCheckMessages::class);
   $status_check_messages->displayAdminPageMessages();
@@ -157,14 +177,14 @@ function automatic_updates_modules_installed($modules) {
   // 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 = \Drupal::service(StatusChecker::class);
   $status_checker->run();
-  /** @var \Drupal\automatic_updates\CronUpdateStage $stage */
-  $stage = \Drupal::service('automatic_updates.cron_update_stage');
+  /** @var \Drupal\automatic_updates\CronUpdateRunner $runner */
+  $runner = \Drupal::service(CronUpdateRunner::class);
   // If cron updates are disabled status check messages will not be displayed on
   // admin pages. Therefore, after installing the module the user will not be
   // alerted to any problems until they access the status report page.
-  if ($stage->getMode() === CronUpdateStage::DISABLED) {
+  if ($runner->getMode() === CronUpdateRunner::DISABLED) {
     /** @var \Drupal\automatic_updates\Validation\AdminStatusCheckMessages $status_check_messages */
     $status_check_messages = \Drupal::classResolver(AdminStatusCheckMessages::class);
     $status_check_messages->displayResultSummary();
@@ -178,7 +198,7 @@ function automatic_updates_modules_uninstalled() {
   // 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 = \Drupal::service(StatusChecker::class);
   $status_checker->run();
 }
 
@@ -205,9 +225,9 @@ function automatic_updates_form_update_settings_alter(array &$form): void {
     '#type' => 'radios',
     '#title' => t('Unattended background updates'),
     '#options' => [
-      CronUpdateStage::DISABLED => t('Disabled'),
-      CronUpdateStage::SECURITY => t('Security updates only'),
-      CronUpdateStage::ALL => t('All patch releases'),
+      CronUpdateRunner::DISABLED => t('Disabled'),
+      CronUpdateRunner::SECURITY => t('Security updates only'),
+      CronUpdateRunner::ALL => t('All patch releases'),
     ],
     '#default_value' => $config->get('unattended.level'),
     '#description' => t('When background updates are applied, your site will be briefly put into maintenance mode.'),
@@ -223,7 +243,7 @@ function automatic_updates_form_update_settings_alter(array &$form): void {
     '#states' => [
       'invisible' => [
         'input[name="unattended_level"]' => [
-          'value' => CronUpdateStage::DISABLED,
+          'value' => CronUpdateRunner::DISABLED,
         ],
       ],
     ],
@@ -258,10 +278,10 @@ function automatic_updates_preprocess_update_project_status(array &$variables) {
   if ($project['name'] !== 'drupal') {
     return;
   }
-  $stage = \Drupal::service('automatic_updates.update_stage');
+  $stage = \Drupal::service(UpdateStage::class);
   $supported_target_versions = [];
   /** @var \Drupal\automatic_updates\ReleaseChooser $recommender */
-  $recommender = \Drupal::service('automatic_updates.release_chooser');
+  $recommender = \Drupal::service(ReleaseChooser::class);
   try {
     if ($installed_minor_release = $recommender->getLatestInInstalledMinor($stage)) {
       $supported_target_versions[] = $installed_minor_release->getVersion();
@@ -273,7 +293,7 @@ function automatic_updates_preprocess_update_project_status(array &$variables) {
   catch (RuntimeException $exception) {
     // If for some reason we are not able to get the update recommendations
     // do not alter the report.
-    watchdog_exception('automatic_updates', $exception);
+    Error::logException(\Drupal::logger('automatic_updates'), $exception);
     return;
   }
   $variables['#attached']['library'][] = 'automatic_updates/update_status';

automatic_updates.services.yml

@@ -2,64 +2,42 @@ services:
   _defaults:
     autowire: true
 
-  automatic_updates.route_subscriber:
-    class: Drupal\automatic_updates\Routing\RouteSubscriber
+  Drupal\automatic_updates\Routing\RouteSubscriber:
     tags:
       - { name: event_subscriber }
-  automatic_updates.status_checker:
-    class: Drupal\automatic_updates\Validation\StatusChecker
+  Drupal\automatic_updates\Validation\StatusChecker:
     arguments:
       # @todo Remove this when https://drupal.org/i/3325557 lands.
       $key_value_expirable_factory: '@keyvalue.expirable'
       $resultsTimeToLive: 24
     tags:
       - { name: event_subscriber }
-  Drupal\automatic_updates\Validation\StatusChecker: '@automatic_updates.status_checker'
-  automatic_updates.status_check_mailer:
-    class: Drupal\automatic_updates\StatusCheckMailer
-  Drupal\automatic_updates\StatusCheckMailer: '@automatic_updates.status_check_mailer'
-  automatic_updates.update_stage:
-    class: Drupal\automatic_updates\UpdateStage
+  Drupal\automatic_updates\StatusCheckMailer: ~
+  Drupal\automatic_updates\UpdateStage:
     calls:
       - ['setLogger', ['@logger.channel.automatic_updates']]
-  Drupal\automatic_updates\UpdateStage: '@automatic_updates.update_stage'
-  automatic_updates.cron_update_stage:
-    class: Drupal\automatic_updates\CronUpdateStage
+  Drupal\automatic_updates\CronUpdateRunner:
     calls:
       - ['setLogger', ['@logger.channel.automatic_updates']]
-    arguments:
-      $inner: '@automatic_updates.cron_update_stage.inner'
     decorates: 'cron'
-  Drupal\automatic_updates\CronUpdateStage: '@automatic_updates.cron_update_stage'
-  automatic_updates.requested_update_validator:
-    class: Drupal\automatic_updates\Validator\RequestedUpdateValidator
+  Drupal\automatic_updates\Validator\RequestedUpdateValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates.staged_projects_validator:
-    class: Drupal\automatic_updates\Validator\StagedProjectsValidator
+  Drupal\automatic_updates\Validator\StagedProjectsValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\automatic_updates\Validator\StagedProjectsValidator: '@automatic_updates.staged_projects_validator'
-  automatic_updates.release_chooser:
-    class: Drupal\automatic_updates\ReleaseChooser
-    arguments:
-      - '@automatic_updates.validator.version_policy'
-  Drupal\automatic_updates\ReleaseChooser: '@automatic_updates.release_chooser'
-  automatic_updates.cron_frequency_validator:
-    class: Drupal\automatic_updates\Validator\CronFrequencyValidator
+  Drupal\automatic_updates\ReleaseChooser: ~
+  Drupal\automatic_updates\Validator\CronFrequencyValidator:
     arguments:
       $lock: '@lock'
     tags:
       - { name: event_subscriber }
-  automatic_updates.validator.staged_database_updates:
-    class: Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator
+  Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates.validator.version_policy:
-    class: Drupal\automatic_updates\Validator\VersionPolicyValidator
+  Drupal\automatic_updates\Validator\VersionPolicyValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\automatic_updates\Validator\VersionPolicyValidator: '@automatic_updates.validator.version_policy'
   Drupal\automatic_updates\Validator\WindowsValidator:
     tags:
       - { name: event_subscriber }
@@ -75,4 +53,9 @@ services:
   Drupal\automatic_updates\MaintenanceModeAwareCommitter:
     tags:
       - { name: event_subscriber }
-  Drupal\automatic_updates\CommandExecutor: {}
+  Drupal\automatic_updates\CommandExecutor:
+    arguments:
+      $appRoot: '%app.root%'
+  Drupal\automatic_updates\Validator\ConsoleUserValidator:
+    tags:
+      - { name: event_subscriber }

automatic_updates_extensions/automatic_updates_extensions.info.yml

 name: 'Automatic Updates Extensions'
 type: module
 description: 'Allows updates to themes and modules'
-core_version_requirement: ^10
-lifecycle: experimental
+core_version_requirement: ^10.1
 dependencies:
   - drupal:automatic_updates

automatic_updates_extensions/automatic_updates_extensions.services.yml

@@ -2,10 +2,13 @@ services:
   _defaults:
     autowire: true
 
-  automatic_updates_extensions.update_stage:
-    class: Drupal\automatic_updates_extensions\ExtensionUpdateStage
-  Drupal\automatic_updates_extensions\ExtensionUpdateStage: '@automatic_updates_extensions.update_stage'
-  automatic_updates_extensions.validator.target_release:
-    class: Drupal\automatic_updates_extensions\Validator\UpdateReleaseValidator
+  Drupal\automatic_updates_extensions\ExtensionUpdateStage: ~
+  Drupal\automatic_updates_extensions\Validator\UpdateReleaseValidator:
+    tags:
+      - { name: event_subscriber }
+  Drupal\automatic_updates_extensions\Validator\ForbidCoreChangesValidator:
+    tags:
+      - { name: event_subscriber }
+  Drupal\automatic_updates_extensions\Validator\RequestedUpdateValidator:
     tags:
       - { name: event_subscriber }

automatic_updates_extensions/src/BatchProcessor.php

@@ -30,7 +30,7 @@ final class BatchProcessor {
    *   The update stage service.
    */
   private static function getStage(): ExtensionUpdateStage {
-    return \Drupal::service('automatic_updates_extensions.update_stage');
+    return \Drupal::service(ExtensionUpdateStage::class);
   }
 
   /**
@@ -84,7 +84,11 @@ final class BatchProcessor {
       static::getStage()->claim($stage_id)->stage();
     }
     catch (\Throwable $e) {
-      static::clean($stage_id, $context);
+      // If the stage was not already destroyed because of this exception
+      // destroy it.
+      if (!static::getStage()->isAvailable()) {
+        static::clean($stage_id, $context);
+      }
       static::handleException($e, $context);
     }
   }

automatic_updates_extensions/src/ExtensionUpdateStage.php

@@ -5,7 +5,7 @@ declare(strict_types = 1);
 namespace Drupal\automatic_updates_extensions;
 
 use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Queue\QueueFactory;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TempStore\SharedTempStoreFactory;
 use Drupal\package_manager\ComposerInspector;
@@ -26,7 +26,12 @@ use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
  *   This class is an internal part of the module's update handling and
  *   should not be used by external code.
  */
-class ExtensionUpdateStage extends StageBase {
+final class ExtensionUpdateStage extends StageBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected string $type = 'automatic_updates_extensions:attended';
 
   /**
    * Constructs a new ExtensionUpdateStage object.
@@ -41,8 +46,8 @@ class ExtensionUpdateStage extends StageBase {
    *   The stager service.
    * @param \PhpTuf\ComposerStager\API\Core\CommitterInterface $committer
    *   The committer service.
-   * @param \Drupal\Core\File\FileSystemInterface $fileSystem
-   *   The file system service.
+   * @param \Drupal\Core\Queue\QueueFactory $queueFactory
+   *   The queue factory.
    * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $eventDispatcher
    *   The event dispatcher service.
    * @param \Drupal\Core\TempStore\SharedTempStoreFactory $tempStoreFactory
@@ -60,14 +65,14 @@ class ExtensionUpdateStage extends StageBase {
     BeginnerInterface $beginner,
     StagerInterface $stager,
     CommitterInterface $committer,
-    FileSystemInterface $fileSystem,
+    QueueFactory $queueFactory,
     EventDispatcherInterface $eventDispatcher,
     SharedTempStoreFactory $tempStoreFactory,
     TimeInterface $time,
     PathFactoryInterface $pathFactory,
     FailureMarker $failureMarker,
   ) {
-    parent::__construct($pathLocator, $beginner, $stager, $committer, $fileSystem, $eventDispatcher, $tempStoreFactory, $time, $pathFactory, $failureMarker);
+    parent::__construct($pathLocator, $beginner, $stager, $committer, $queueFactory, $eventDispatcher, $tempStoreFactory, $time, $pathFactory, $failureMarker);
   }
 
   /**

automatic_updates_extensions/src/Form/UpdateReady.php

@@ -7,6 +7,7 @@ namespace Drupal\automatic_updates_extensions\Form;
 use Drupal\automatic_updates\Form\UpdateFormBase;
 use Drupal\package_manager\ComposerInspector;
 use Drupal\package_manager\Exception\StageFailureMarkerException;
+use Drupal\package_manager\InstalledPackage;
 use Drupal\package_manager\PathLocator;
 use Drupal\package_manager\ProjectInfo;
 use Drupal\package_manager\ValidationResult;
@@ -30,7 +31,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  * Defines a form to commit staged updates.
  *
  * @internal
- *   Form classes are internal.
+ *   Form classes are internal and should not be used by external code.
  */
 final class UpdateReady extends UpdateFormBase {
 
@@ -79,14 +80,14 @@ final class UpdateReady extends UpdateFormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('automatic_updates_extensions.update_stage'),
+      $container->get(ExtensionUpdateStage::class),
       $container->get('messenger'),
       $container->get('state'),
       $container->get('extension.list.module'),
       $container->get('renderer'),
       $container->get('event_dispatcher'),
-      $container->get('package_manager.composer_inspector'),
-      $container->get('package_manager.path_locator')
+      $container->get(ComposerInspector::class),
+      $container->get(PathLocator::class),
     );
   }
 
@@ -133,7 +134,11 @@ final class UpdateReady extends UpdateFormBase {
     $form['package_updates'] = $this->showUpdates();
     $form['backup'] = [
       '#prefix' => '<strong>',
-      '#markup' => $this->t('Back up your database and site before you continue. <a href=":backup_url">Learn how</a>.', [':backup_url' => 'https://www.drupal.org/node/22281']),
+      '#type' => 'checkbox',
+      '#title' => $this->t('Warning: Updating contributed modules or themes may leave your site inoperable or looking wrong.'),
+      '#description' => $this->t('Back up your database and site before you continue. <a href=":backup_url">Learn how</a>. Each contributed module or theme may follow different standards for backwards compatibility, may or may not have tests, and may add or remove features in any release. For these reasons, it is highly recommended that you test this update in a development environment first.', [':backup_url' => 'https://www.drupal.org/node/22281']),
+      '#required' => TRUE,
+      '#default_value' => FALSE,
       '#suffix' => '</strong>',
     ];
     $form['maintenance_mode'] = [
@@ -230,7 +235,7 @@ final class UpdateReady extends UpdateFormBase {
         continue;
       }
       $updated_project_info[$name] = [
-        'title' => $this->getProjectTitle($updated_package->name),
+        'title' => $this->getProjectTitleFromPackage($updated_package),
         'installed_version' => $installed_packages[$updated_package->name]->version,
         'updated_version' => $updated_package->version,
       ];
@@ -262,21 +267,25 @@ final class UpdateReady extends UpdateFormBase {
   /**
    * Gets the human-readable project title for a Composer package.
    *
-   * @param string $package_name
-   *   Package name.
+   * @param \Drupal\package_manager\InstalledPackage $package
+   *   The installed package.
    *
    * @return string
-   *   The human-readable title of the project.
+   *   The human-readable title of the project. If no project information is
+   *   available, the package name is returned.
    */
-  private function getProjectTitle(string $package_name): string {
-    $project_name = str_replace('drupal/', '', $package_name);
+  private function getProjectTitleFromPackage(InstalledPackage $package): string {
+    $project_name = $package->getProjectName();
+    if (!$project_name) {
+      return $package->name;
+    }
     $project_info = new ProjectInfo($project_name);
     $project_data = $project_info->getProjectInfo();
     if ($project_data) {
       return $project_data['title'];
     }
     else {
-      return $project_name;
+      return $package->name;
     }
   }
 

automatic_updates_extensions/src/Form/UpdaterForm.php

@@ -20,6 +20,7 @@ use Drupal\package_manager\PathLocator;
 use Drupal\package_manager\ProjectInfo;
 use Drupal\package_manager\ValidationResult;
 use Drupal\system\SystemManager;
+use Drupal\update\ProjectRelease;
 use Drupal\update\UpdateManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -28,7 +29,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  * A form for selecting extension updates.
  *
  * @internal
- *   Form classes are internal.
+ *   Form classes are internal and should not be used by external code.
  */
 final class UpdaterForm extends UpdateFormBase {
 
@@ -37,13 +38,13 @@ final class UpdaterForm extends UpdateFormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('automatic_updates_extensions.update_stage'),
+      $container->get(ExtensionUpdateStage::class),
       $container->get('event_dispatcher'),
       $container->get('renderer'),
       $container->get('state'),
-      $container->get('package_manager.failure_marker'),
-      $container->get('package_manager.composer_inspector'),
-      $container->get('package_manager.path_locator')
+      $container->get(FailureMarker::class),
+      $container->get(ComposerInspector::class),
+      $container->get(PathLocator::class),
     );
   }
 
@@ -110,10 +111,16 @@ final class UpdaterForm extends UpdateFormBase {
         default:
           $status_message = '';
       }
+      $project_release = ProjectRelease::createFromArray($update_project['releases'][$update_project['recommended']]);
       $options[$project_name] = [
         $update_project['title'] . $status_message,
         $update_project['existing_version'],
-        $update_project['recommended'],
+        $this->t(
+          '@version (<a href=":url">Release notes</a>)',
+          [
+            '@version' => $project_release->getVersion(),
+            ':url' => $project_release->getReleaseUrl(),
+          ]),
       ];
       $recommended_versions[$project_name] = $update_project['recommended'];
     }
@@ -236,13 +243,12 @@ final class UpdaterForm extends UpdateFormBase {
 
     $all_projects_data = update_calculate_project_data($available_updates);
     $outdated_modules = [];
-    $installed_packages = $this->composerInspector->getInstalledPackagesList($this->pathLocator->getProjectRoot())
-      ->getArrayCopy();
+    $installed_packages = $this->composerInspector->getInstalledPackagesList($this->pathLocator->getProjectRoot());
     $non_supported_update_statuses = [];
     foreach ($all_projects_data as $project_name => $project_data) {
       if (in_array($project_data['project_type'], $supported_project_types, TRUE)) {
         if ($project_data['status'] !== UpdateManagerInterface::CURRENT) {
-          if (!array_key_exists("drupal/$project_name", $installed_packages)) {
+          if ($installed_packages->getPackageByDrupalProjectName($project_name) === NULL) {
             $non_supported_update_statuses[] = $project_data['status'];
             continue;
           }

automatic_updates_extensions/src/Validator/ForbidCoreChangesValidator.php

+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\automatic_updates_extensions\Validator;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\Url;
+use Drupal\package_manager\ComposerInspector;
+use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\Event\StatusCheckEvent;
+use Drupal\package_manager\InstalledPackagesList;
+use Drupal\package_manager\PathLocator;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Validates that no changes were made to Drupal Core packages.
+ *
+ * @internal
+ *   This is an internal part of Automatic Updates and may be changed or removed
+ *   at any time without warning. External code should not interact with this
+ *   class.
+ */
+final class ForbidCoreChangesValidator implements EventSubscriberInterface {
+
+  use StringTranslationTrait;
+
+  public function __construct(
+    private readonly PathLocator $pathLocator,
+    private readonly ComposerInspector $composerInspector,
+  ) {}
+
+  /**
+   * Validates the staged packages.
+   *
+   * @param \Drupal\package_manager\Event\StatusCheckEvent|\Drupal\package_manager\Event\PreApplyEvent $event
+   *   The event object.
+   */
+  public function validateStagedCorePackages(StatusCheckEvent|PreApplyEvent $event): void {
+    $stage = $event->stage;
+    // We only want to do this check if the stage belongs to Automatic Updates
+    // Extensions.
+    if ($stage->getType() !== 'automatic_updates_extensions:attended' || !$stage->stageDirectoryExists()) {
+      return;
+    }
+    $active_core_packages = $this->getInstalledCorePackages($this->pathLocator->getProjectRoot());
+    $stage_core_packages = $this->getInstalledCorePackages($stage->getStageDirectory());
+
+    $new_packages = $stage_core_packages->getPackagesNotIn($active_core_packages);
+    $removed_packages = $active_core_packages->getPackagesNotIn($stage_core_packages);
+    $changed_packages = $active_core_packages->getPackagesWithDifferentVersionsIn($stage_core_packages);
+
+    $error_messages = [];
+    foreach ($new_packages as $new_package) {
+      $error_messages[] = $this->t("'@name' installed.", ['@name' => $new_package->name]);
+    }
+    foreach ($removed_packages as $removed_package) {
+      $error_messages[] = $this->t("'@name' removed.", ['@name' => $removed_package->name]);
+    }
+    foreach ($changed_packages as $name => $updated_package) {
+      $error_messages[] = $this->t(
+        "'@name' version changed from @active_version to @staged_version.",
+        [
+          '@name' => $updated_package->name,
+          '@staged_version' => $stage_core_packages[$name]->version,
+          '@active_version' => $updated_package->version,
+        ]
+      );
+
+    }
+    if ($error_messages) {
+      $event->addError($error_messages, $this->t(
+        'Updating Drupal Core while updating extensions is currently not supported. Use <a href=":url">this form</a> to update Drupal core. The following changes were made to the Drupal core packages:',
+        [':url' => Url::fromRoute('update.report_update')->toString()]
+      ));
+    }
+  }
+
+  /**
+   * Gets all the installed core packages for a given project root.
+   *
+   * This method differs from
+   * \Drupal\package_manager\ComposerInspector::getInstalledPackagesList in that
+   * it ensures that the 'drupal/core' is included in the list if present.
+   *
+   * @param string $composer_root
+   *   The path to the composer root.
+   *
+   * @return \Drupal\package_manager\InstalledPackagesList
+   *   The installed core packages.
+   */
+  private function getInstalledCorePackages(string $composer_root): InstalledPackagesList {
+    $installed_package_list = $this->composerInspector->getInstalledPackagesList($composer_root);
+    $core_packages = $installed_package_list->getCorePackages();
+    if (isset($installed_package_list['drupal/core']) && !isset($core_packages['drupal/core'])) {
+      $core_packages = new InstalledPackagesList(array_merge($core_packages->getArrayCopy(), ['drupal/core' => $installed_package_list['drupal/core']]));
+    }
+    return $core_packages;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents(): array {
+    $events[StatusCheckEvent::class][] = ['validateStagedCorePackages'];
+    $events[PreApplyEvent::class][] = ['validateStagedCorePackages'];
+    return $events;
+  }
+
+}

automatic_updates_extensions/src/Validator/RequestedUpdateValidator.php

+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\automatic_updates_extensions\Validator;
+
+use Composer\Semver\Semver;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\package_manager\ComposerInspector;
+use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\Event\StatusCheckEvent;
+use Drupal\package_manager\PathLocator;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Validates that requested packages have been updated.
+ *
+ * @internal
+ *   This is an internal part of Automatic Updates and may be changed or removed
+ *   at any time without warning. External code should not interact with this
+ *   class.
+ */
+final class RequestedUpdateValidator implements EventSubscriberInterface {
+
+  use StringTranslationTrait;
+
+  /**
+   * Constructs a RequestedUpdateValidator object.
+   *
+   * @param \Drupal\package_manager\ComposerInspector $composerInspector
+   *   The Composer inspector service.
+   * @param \Drupal\package_manager\PathLocator $pathLocator
+   *   The path locator service.
+   */
+  public function __construct(
+    private readonly ComposerInspector $composerInspector,
+    private readonly PathLocator $pathLocator,
+  ) {}
+
+  /**
+   * Validates that requested packages have been updated to the right version.
+   *
+   * @param \Drupal\package_manager\Event\PreApplyEvent|\Drupal\package_manager\Event\StatusCheckEvent $event
+   *   The pre-apply event.
+   */
+  public function checkRequestedStagedVersion(PreApplyEvent|StatusCheckEvent $event): void {
+    $stage = $event->stage;
+    if ($stage->getType() !== 'automatic_updates_extensions:attended' || !$stage->stageDirectoryExists()) {
+      return;
+    }
+    $requested_package_versions = $stage->getPackageVersions();
+    $active = $this->composerInspector->getInstalledPackagesList($this->pathLocator->getProjectRoot());
+    $staged = $this->composerInspector->getInstalledPackagesList($event->stage->getStageDirectory());
+    $changed_stage_packages = $staged->getPackagesWithDifferentVersionsIn($active)->getArrayCopy();
+
+    if (empty($changed_stage_packages)) {
+      $event->addError([$this->t('No updates detected in the staging area.')]);
+      return;
+    }
+
+    // Check for all changed the packages if they are updated to the requested
+    // version.
+    foreach (['production', 'dev'] as $package_type) {
+      foreach ($requested_package_versions[$package_type] as $requested_package_name => $requested_version) {
+        if (array_key_exists($requested_package_name, $changed_stage_packages)) {
+          $staged_version = $changed_stage_packages[$requested_package_name]->version;
+          if (!Semver::satisfies($staged_version, $requested_version)) {
+            $event->addError([
+              $this->t(
+                "The requested update to '@requested_package_name' to version '@requested_version' does not match the actual staged update to '@staged_version'.",
+                [
+                  '@requested_package_name' => $requested_package_name,
+                  '@requested_version' => $requested_version,
+                  '@staged_version' => $staged_version,
+                ]
+              ),
+            ]);
+          }
+        }
+        else {
+          $event->addError([
+            $this->t(
+              "The requested update to '@requested_package_name' to version '@requested_version' was not performed.",
+              [
+                '@requested_package_name' => $requested_package_name,
+                '@requested_version' => $requested_version,
+              ]
+            ),
+          ]);
+        }
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents(): array {
+    $events[StatusCheckEvent::class][] = ['checkRequestedStagedVersion'];
+    $events[PreApplyEvent::class][] = ['checkRequestedStagedVersion'];
+    return $events;
+  }
+
+}

automatic_updates_extensions/src/Validator/UpdateReleaseValidator.php

@@ -7,7 +7,6 @@ namespace Drupal\automatic_updates_extensions\Validator;
 use Drupal\package_manager\ComposerInspector;
 use Drupal\package_manager\PathLocator;
 use Drupal\package_manager\ProjectInfo;
-use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
 use Drupal\package_manager\LegacyVersionUtility;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\package_manager\Event\PreCreateEvent;
@@ -89,7 +88,7 @@ final class UpdateReleaseValidator implements EventSubscriberInterface {
   public function checkRelease(PreCreateEvent $event): void {
     $stage = $event->stage;
     // This check only works with Automatic Updates Extensions.
-    if (!$stage instanceof ExtensionUpdateStage) {
+    if ($stage->getType() !== 'automatic_updates_extensions:attended') {
       return;
     }
 

automatic_updates_extensions/tests/fixtures/release-history/automatic_updates_extensions_test_theme.1.1.xml

@@ -35,7 +35,7 @@ Contains metadata about the following (fake) releases of automatic_updates_exten
       <version>3.0.0</version>
       <tag>3.0.0</tag>
       <status>published</status>
-      <release_link>http://example.com/automatic_updates_extensions_test_theme/releases/3.0.0</release_link>
+      <release_link>http://example.com/automatic_updates_extensions_test_theme-3-0-0-release</release_link>
       <download_link>http://example.com/automatic_updates_extensions_test_theme-3.0.0.tar.gz</download_link>
       <date>1597793786</date>
       <files>
@@ -62,7 +62,7 @@ Contains metadata about the following (fake) releases of automatic_updates_exten
       <version>8.x-2.1</version>
       <tag>8.x-2.1</tag>
       <status>published</status>
-      <release_link>http://example.com/automatic_updates_extensions_test_theme/releases/8.x-2.1</release_link>
+      <release_link>http://example.com/automatic_updates_extensions_test_theme-8-x-2-1-release</release_link>
       <download_link>http://example.com/automatic_updates_extensions_test_theme-8.x-2.1.tar.gz</download_link>
       <date>1597793786</date>
       <files>
@@ -95,7 +95,7 @@ Contains metadata about the following (fake) releases of automatic_updates_exten
       <version>8.x-2.0</version>
       <tag>8.x-2.0</tag>
       <status>published</status>
-      <release_link>http://example.com/automatic_updates_extensions_test_theme/releases/8.x-2.0</release_link>
+      <release_link>http://example.com/automatic_updates_extensions_test_theme-8-x-2-0-release</release_link>
       <download_link>http://example.com/automatic_updates_extensions_test_theme-8.x-2.0.tar.gz</download_link>
       <date>1597793786</date>
       <files>

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

@@ -4,6 +4,8 @@ declare(strict_types = 1);
 
 namespace Drupal\automatic_updates_extensions_test_api;
 
+use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
+use Drupal\package_manager\PathLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Drupal\package_manager_test_api\ApiController as PackageManagerApiController;
@@ -23,8 +25,8 @@ class ApiController extends PackageManagerApiController {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('automatic_updates_extensions.update_stage'),
-      $container->get('package_manager.path_locator')
+      $container->get(ExtensionUpdateStage::class),
+      $container->get(PathLocator::class),
     );
   }
 

automatic_updates_extensions/tests/src/Build/ModuleUpdateTest.php

@@ -14,7 +14,7 @@ use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
  * @group automatic_updates_extensions
  * @internal
  */
-class ModuleUpdateTest extends UpdateTestBase {
+final class ModuleUpdateTest extends UpdateTestBase {
 
   use FormTestTrait;
 
@@ -42,7 +42,7 @@ END;
     $this->writeSettings($code);
     $alpha_repo_path = $this->copyFixtureToTempDirectory(__DIR__ . '/../../../../package_manager/tests/fixtures/build_test_projects/alpha/1.0.0');
     $this->addRepository('alpha', $alpha_repo_path);
-    $this->runComposer('COMPOSER_MIRROR_PATH_REPOS=1 composer require drupal/alpha --update-with-all-dependencies', 'project');
+    $this->runComposer('composer require drupal/alpha --update-with-all-dependencies', 'project');
     $this->assertModuleVersion('alpha', '1.0.0');
     $fs = new SymfonyFilesystem();
     $fs->mirror($this->copyFixtureToTempDirectory(__DIR__ . '/../../fixtures/new_module'), $this->getWorkspaceDirectory() . '/project/web/modules');
@@ -54,6 +54,11 @@ END;
 
     // Change the module's upstream version.
     static::copyFixtureFilesTo(__DIR__ . '/../../../../package_manager/tests/fixtures/build_test_projects/alpha/1.1.0', $alpha_repo_path);
+
+    // Ensure that none of the above changes have caused any status check or
+    // other errors on the status report.
+    $this->checkForUpdates();
+    $this->assertStatusReportChecksSuccessful();
   }
 
   /**
@@ -76,24 +81,22 @@ END;
     $this->assertStringContainsString('The project new_module is not a Drupal project known to Composer and cannot be updated.', $page_text);
     $this->assertStringContainsString('new_module', $page_text);
     // Use the API endpoint to create a stage and update the 'alpha' module to
-    // 1.1.0. We ask the API to return the contents of the module's
-    // composer.json file, so we can assert that they were updated to the
-    // version we expect.
-    // @see \Drupal\automatic_updates_extensions_test_api\ApiController::run()
-    $file_contents = $this->getPackageManagerTestApiResponse(
+    // 1.1.0.
+    $this->makePackageManagerTestApiRequest(
       '/automatic-updates-extensions-test-api',
       [
         'projects' => [
           'alpha' => '1.1.0',
         ],
-        'files_to_return' => [
-          'web/modules/contrib/alpha/composer.json',
-        ],
       ]
     );
 
-    $module_composer_json = json_decode($file_contents['web/modules/contrib/alpha/composer.json']);
-    $this->assertSame('1.1.0', $module_composer_json?->version);
+    $updated_composer_json = $this->getWebRoot() . 'modules/contrib/alpha/composer.json';
+    // Assert the module was updated.
+    $this->assertFileEquals(
+      __DIR__ . '/../../../../package_manager/tests/fixtures/build_test_projects/alpha/1.1.0/composer.json',
+      $updated_composer_json,
+    );
     $this->assertRequestedChangesWereLogged(['Update drupal/alpha from 1.0.0 to 1.1.0']);
     $this->assertAppliedChangesWereLogged(['Updated drupal/alpha from 1.0.0 to 1.1.0']);
   }
@@ -129,6 +132,7 @@ END;
     $page->pressButton('Update');
     $this->waitForBatchJob();
     $assert_session->pageTextContains('Ready to update');
+    $page->checkField('backup');
     $page->pressButton('Continue');
     $this->waitForBatchJob();
     $assert_session->pageTextContains('Update complete!');

automatic_updates_extensions/tests/src/Functional/ComposerStagerOperationFailureTest.php

+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\automatic_updates_extensions\Functional;
+
+use Drupal\package_manager_bypass\LoggingBeginner;
+use Drupal\package_manager_bypass\LoggingCommitter;
+use Drupal\package_manager_bypass\NoOpStager;
+use PhpTuf\ComposerStager\API\Exception\InvalidArgumentException;
+use PhpTuf\ComposerStager\API\Exception\LogicException;
+
+/**
+ * @covers \Drupal\automatic_updates_extensions\Form\UpdaterForm
+ * @group automatic_updates_extensions
+ * @internal
+ */
+class ComposerStagerOperationFailureTest extends UpdaterFormTestBase {
+
+  /**
+   * Tests Composer operation failure is handled properly.
+   *
+   * @param string $exception_class
+   *   The exception class.
+   * @param string $service_class
+   *   The Composer Stager service which should throw an exception.
+   *
+   * @dataProvider providerComposerOperationFailure
+   */
+  public function testComposerOperationFailure(string $exception_class, string $service_class): void {
+    $page = $this->getSession()->getPage();
+    $assert_session = $this->assertSession();
+    $this->setReleaseMetadata(__DIR__ . '/../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml');
+    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
+    $this->setProjectInstalledVersion(['semver_test' => '8.1.0']);
+    $this->checkForUpdates();
+    // Navigate to the update form.
+    $this->drupalGet('/admin/reports/updates');
+    $this->clickLink('Update Extensions');
+    $this->assertTableShowsUpdates(
+      'Semver Test',
+      '8.1.0',
+      '8.1.1',
+    );
+    $this->getStageFixtureManipulator()->setVersion('drupal/semver_test_package_name', '8.1.1');
+    $this->assertUpdatesCount(1);
+    $page->checkField('projects[semver_test]');
+
+    // Make the specified Composer Stager operation class throw an exception.
+    $message = $this->createComposeStagerMessage("Failure from inside $service_class");
+    $exception = new $exception_class($message);
+    call_user_func([$service_class, 'setException'], $exception);
+
+    // Start the update.
+    $page->pressButton('Update');
+    $this->checkForMetaRefresh();
+    // We can't continue the update after an error in the committer.
+    if ($service_class === LoggingCommitter::class) {
+      $this->acceptWarningAndUpdate();
+      $this->clickLink('the error page');
+      $assert_session->statusCodeEquals(200);
+      $assert_session->statusMessageContains('Automatic updates failed to apply, and the site is in an indeterminate state. Consider restoring the code and database from a backup.');
+      return;
+    }
+    $this->clickLink('the error page');
+    $assert_session->statusMessageContains($exception->getMessage());
+
+    // Make the same Composer Stager operation class NOT throw an exception.
+    call_user_func([$service_class, 'setException'], NULL);
+
+    // Stage should be automatically deleted when an error occurs.
+    $assert_session->buttonNotExists('Delete existing update');
+    // This ensures that we can still update after the exception no longer
+    // exists.
+    $page->checkField('projects[semver_test]');
+    $this->getStageFixtureManipulator()->setVersion('drupal/semver_test_package_name', '8.1.1');
+    $page->pressButton('Update');
+    $this->checkForMetaRefresh();
+    $this->acceptWarningAndUpdate();
+    $assert_session->statusMessageContains('Update complete!');
+  }
+
+  /**
+   * Data provider for testComposerOperationFailure().
+   *
+   * @return string[][]
+   *   The test cases.
+   */
+  public function providerComposerOperationFailure(): array {
+    return [
+      'LogicException from Beginner' => [LogicException::class, LoggingBeginner::class],
+      'LogicException from Stager' => [LogicException::class, NoOpStager::class],
+      'InvalidArgumentException from Stager' => [InvalidArgumentException::class, NoOpStager::class],
+      'LogicException from Committer' => [LogicException::class, LoggingCommitter::class],
+    ];
+  }
+
+}

automatic_updates_extensions/tests/src/Functional/DisplayUpdatesTest.php

@@ -9,7 +9,7 @@ namespace Drupal\Tests\automatic_updates_extensions\Functional;
  * @group automatic_updates_extensions
  * @internal
  */
-class DisplayUpdatesTest extends UpdaterFormTestBase {
+final class DisplayUpdatesTest extends UpdaterFormTestBase {
 
   /**
    * Data provider for testDisplayUpdates().
@@ -67,7 +67,7 @@ class DisplayUpdatesTest extends UpdaterFormTestBase {
     $page->checkField('projects[semver_test]');
     $this->getStageFixtureManipulator()
       ->setVersion('drupal/aaa_update_test', '2.1.0')
-      ->setVersion('drupal/semver_test', '8.1.1');
+      ->setVersion('drupal/semver_test_package_name', '8.1.1');
     $page->pressButton('Update');
     $this->checkForMetaRefresh();
     $this->assertUpdateStagedTimes(1);