.cspell.json

+{
+  "dictionaries": ["drupal","companies", "fonts", "html", "php", "softwareTerms", "automatic_updates"],
+  "dictionaryDefinitions": [
+    { "name": "automatic_updates", "path": "./dictionary.txt"}
+  ],
+  "ignorePaths": [
+    "README.md"
+  ]
+}

.gitattributes

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

.gitignore

+/.idea
+/auto-updates-dev

.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]

DEVELOPING.md

-### Prerequisites
-* PHP 7.4 or later.
+# Local development environment setup
+
+## Quick setup
+
+A simple setup is enough for most users to start contributing to Automatic Updates. For advanced needs, see [Customizing your setup](#customizing-your-setup) and [Alternative setup options](#alternative-setup-options).
+
+Assuming you meet the [system requirements](#system-requirements), simply run the following command <sup>[[1]](#footnote-1), [[2]](#footnote-2)</sup> from the directory you would like to install your development environment under <sup>[[3]](#footnote-3)</sup>. It will prompt for confirmation before beginning.
+
+```shell
+/bin/bash -c "$(curl -fsSL https://git.drupalcode.org/project/automatic_updates/-/raw/3.0.x/scripts/setup_local_dev.sh)"
+```
+
+That's it. The success message will display next steps.
+
+## Details and options
+
+---
+
+* [System requirements](#system-requirements)
+* [Caveats](#caveats)
+* [Customizing your setup](#customizing-your-setup)
+* [Alternative setup options](#alternative-setup-options)
+* [Maintaining your environment](#maintaining-your-environment)
+
+---
+
+### System requirements
+* A *nix-based operating system, such as Linux or macOS.
+* Drupal 10 or later.
 * Composer 2 or later. (Automatic Updates is not compatible with Composer 1.)
 * Git must be installed.
 
-### Caveats
-* Symbolic links are not currently supported by Package Manager. If the Drupal core checkout contains any symbolic links, tests will not work. By default, there shouldn't be any, but some may exist in certain situations (for example, if Drush or Drupal core's JavaScript dependencies have been installed). To scan for symbolic links, run `find . -type l` from the Drupal core repository root.
+### Customizing your setup
+Several details of your setup can be customized via environment variables. Set these before running [the installation command above](#local-development-environment-setup).
 
-### Step 1: Set up Drupal core
-For development and running the module's tests, Automatic Updates assumes you are working from a Git clone of Drupal core. To set one up:
+```shell
+DRUPAL_CORE_BRANCH="10.0.x" # The branch of Drupal core that will be installed.
+DRUPAL_CORE_SHALLOW_CLONE="TRUE" # Whether or not to do a "shallow clone" of Drupal core. (Defaults to TRUE.) See note below.
+AUTOMATIC_UPDATES_BRANCH="3.0.x" # The branch of the Automatic Updates module that will be installed.
+SITE_DIRECTORY="auto_updates_dev" # The path to the directory where the dev environment will be installed.
+SITE_HOST=".test" # The path for Drupal's TRUSTED_HOST_PATTERN.
 ```
-git clone https://git.drupalcode.org/project/drupal.git --branch 9.5.x auto-updates-dev
+
+Note: A shallow Git clone is much smaller and therefore faster, but it removes the ability to do debugging operations such as `git bisect` or `git blame`. To recover these abilities, [you can convert your repository to a full clone after the fact](https://stackoverflow.com/questions/6802145/how-to-convert-a-git-shallow-clone-to-a-full-clone):
+
+// cSpell:disable
+```shell
 cd auto-updates-dev
-composer config platform.php 7.4.0
-composer install
+git fetch --unshallow
 ```
-Replace `9.5.x` with the desired development branch of Drupal core. Be sure to point your web server to the `auto-updates-dev` directory, so you can access this code base in a browser.
+// cSpell:enable
 
-### Step 2: Clone Automatic Updates
-Clone Automatic Updates' main development branch (8.x-2.x):
-```
-git clone --branch '8.x-2.x' https://git.drupalcode.org/project/automatic_updates.git ./modules/automatic_updates
-```
+### Alternative setup options
+You can download the setup script first to review its contents or modify it before running it:
 
-### Step 3: Install dependencies
-From the Drupal repository root:
+```shell
+curl --output setup_local_dev.sh https://git.drupalcode.org/project/automatic_updates/-/raw/3.0.x/scripts/setup_local_dev.sh
+
+./scripts/setup_local_dev.sh
 ```
-composer require php-tuf/composer-stager "symfony/config:^4.4 || ^6.1"
-git reset --hard
+
+You can clone the whole repository:
+
+```shell
+git clone https://git.drupalcode.org/project/automatic_updates.git
+cd automatic_updates
+
+./scripts/setup_local_dev.sh
 ```
-Note: If you switch to a different branch of Drupal core and delete the `vendor` directory, you will need to do this step again after running `composer install`.
+
+To set up your environment manually, use the setup script as a reference.
+
+### Maintaining your environment
+
+* If you want to switch to a different branch of Drupal core during development or if you delete the `vendor` directory, you may will need to do this step again after running `composer install`.
+* _DO NOT_ delete the `automatic_updates` module or the `modules` directory it is in or you will lose any code changes forever. As appropriate, commit them and push them to a remote first--unless you don't care about keeping them. (Don't forget branches other than the one you have checked out.)
+
+---
+
+<a name="footnote-1"><sup>1</sup></a> When running a script downloaded from the Web, it is always wise to read its contents first. Ours ([`setup_local_dev.sh`](https://git.drupalcode.org/project/automatic_updates/-/raw/3.0.x/scripts/setup_local_dev.sh)) is documented with code comments to help with that. For a more cautious approach, see [Alternative setup options](#alternative-setup-options) above.
+
+<a name="footnote-2"><sup>2</sup></a> Curl options explained:
+[`-f, --fail`](https://curl.se/docs/manpage.html#-f),
+[`-s, --silent`](https://curl.se/docs/manpage.html#-s),
+[`-S, --show-error`](https://curl.se/docs/manpage.html#-S),
+[`-L, --location`](https://curl.se/docs/manpage.html#-L).
+
+<a name="footnote-3"><sup>3</sup></a> For example, run it in `~/Projects` to create your environment at `~/Projects/auto-updates-dev` or `/var/www` to create it at `/var/www/auto-updates-dev`. See [Customizing your setup](#customizing-your-setup) to override this behavior.

README.md

 Automatic Updates
 ---------------
-### Requirements
-- The Drupal project's codebase must be writable in order to use Automatic Updates. This includes Drupal, modules, themes and the Composer dependencies in the vendor directory. This makes Automatic Updates incompatible with some hosting platforms.
-- The Composer executable must be in the PATH of the web server. If the Composer executable cannot be found the location can be set by adding
-  `$config['package_manager.settings']['executables']['composer'] = '/path/to/composer';` in `settings.php`
 
-### Limitations
-- Drupal multi-site installations are not supported.
-- Automatic Updates does not support version control such as Git. It is the responsibility of site administrators to commit any updates to version control if needed.
+Package Manager is a framework for updating Drupal core and installing contributed modules and themes via Composer. It has no user interface, but it provides an API for creating a temporary copy of the current site, making changes to the copy, and then syncing those changes back into the live site.
+
+### Automatic Updates Initiative
+
+Follow and read more on the [Automatic Updates Initiative overview and roadmap](https://www.drupal.org/project/ideas/issues/2940731).
+
+### Updating contrib modules and themes
 
-### Updating contributed modules and themes
 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.☢️ ⚠️
 
-### Automatic Updates Initiative
+### More info
 
-- Follow and read up on
-  [Ideas queue - Automatic Updates initiative](https://www.drupal.org/project/ideas/issues/2940731)
+Get more details about the Package Manager module, once installed, at it help page (`admin/help/package_manager`).

auto-update

+#!/usr/bin/env php
+<?php
+
+/**
+ * @file
+ * Provides a terminal command for performing automatic updates.
+ */
+
+use Drupal\automatic_updates\Commands\PostApplyCommand;
+use Drupal\automatic_updates\Commands\RunCommand;
+use Symfony\Component\Console\Application;
+
+if (PHP_SAPI !== 'cli') {
+  throw new \RuntimeException('This command must be run from the command line.');
+}
+
+// Find the autoloader. We know that Automatic Updates is installed somewhere
+// in a Drupal code base, so move up the file system until we find
+// `./vendor/autoload.php`.
+$current_dir = __DIR__;
+$previous_dir = NULL;
+while ($current_dir !== $previous_dir) {
+  $file = $current_dir . '/vendor/autoload.php';
+  if (file_exists($file)) {
+    /** @var \Composer\Autoload\ClassLoader $autoloader */
+    $autoloader = require_once $file;
+    break;
+  }
+  $previous_dir = $current_dir;
+  $current_dir = dirname($current_dir);
+}
+
+if (empty($autoloader)) {
+  throw new \RuntimeException('The autoloader could not be found. Did you run `composer install`?');
+}
+
+// Automatic Updates' namespace is not available for autoloading because it is
+// a Drupal module, which means Drupal must be booted up in order to access it.
+// Since Drupal isn't booted yet, we need to make the autoloader aware of the
+// command namespace.
+$autoloader->addPsr4('Drupal\\automatic_updates\\Commands\\', __DIR__ . '/src/Commands');
+
+$application = new Application('Automatic Updates', '3.0.0');
+$application->add(new RunCommand($autoloader));
+$application->add(new PostApplyCommand($autoloader));
+$application->setDefaultCommand('run')->run();

automatic_updates.info.yml

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

automatic_updates.install

@@ -5,13 +5,18 @@
  * Contains install and update functions for Automatic Updates.
  */
 
-use Drupal\automatic_updates\Validation\ReadinessRequirements;
+declare(strict_types = 1);
+
+use Drupal\automatic_updates\CronUpdateRunner;
+use Drupal\automatic_updates\UpdateStage;
+use Drupal\automatic_updates\Validation\StatusCheckRequirements;
+use Drupal\system\SystemManager;
 
 /**
  * Implements hook_uninstall().
  */
 function automatic_updates_uninstall() {
-  \Drupal::service('automatic_updates.updater')->destroy(TRUE);
+  \Drupal::service(UpdateStage::class)->destroy(TRUE);
 }
 
 /**
@@ -20,8 +25,30 @@ 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);
+    $requirements = $status_check_requirement->getRequirements();
+
+    // 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') !== CronUpdateRunner::DISABLED) {
+      $requirements['automatic_updates_cron'] = [
+        'title' => t('Cron installs updates automatically'),
+        'severity' => SystemManager::REQUIREMENT_WARNING,
+        'value' => t('Enabled. This is NOT an officially supported feature of the Automatic Updates module at this time. Use at your own risk.'),
+      ];
+    }
+    return $requirements;
   }
 }
+
+// BEGIN: DELETE FROM CORE MERGE REQUEST
+
+/**
+ * Implements hook_update_last_removed().
+ */
+function automatic_updates_update_last_removed(): int {
+  return 9002;
+}
+
+// END: DELETE FROM CORE MERGE REQUEST

automatic_updates.post_update.php

+<?php
+
+/**
+ * @file
+ * Contains post-update hooks for Automatic Updates.
+ *
+ * DELETE THIS FILE FROM CORE MERGE REQUEST.
+ */
+
+declare(strict_types = 1);
+
+/**
+ * Implements hook_removed_post_updates().
+ */
+function automatic_updates_removed_post_updates(): array {
+  return [
+    'automatic_updates_post_update_create_status_check_mail_config' => '3.0.0',
+  ];
+}

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,4 @@ automatic_updates.finish:
     _permission: 'administer software updates'
   options:
     _maintenance_access: TRUE
-    _automatic_updates_readiness_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.
-automatic_updates.report_update:
-  path: '/admin/reports/updates/automatic-update'
-  defaults:
-    _form: '\Drupal\automatic_updates\Form\UpdaterForm'
-    _title: 'Update'
-  requirements:
-    _permission: 'administer software updates'
-  options:
-    _admin_route: TRUE
-    _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
-automatic_updates.module_update:
-  path: '/admin/modules/automatic-update'
-  defaults:
-    _form: '\Drupal\automatic_updates\Form\UpdaterForm'
-    _title: 'Update'
-  requirements:
-    _permission: 'administer software updates'
-  options:
-    _admin_route: TRUE
-    _maintenance_access: TRUE
-    _automatic_updates_readiness_messages: skip
-automatic_updates.theme_update:
-  path: '/admin/theme/automatic-update'
-  defaults:
-    _form: '\Drupal\automatic_updates\Form\UpdaterForm'
-    _title: 'Update'
-  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

 services:
-  automatic_updates.route_subscriber:
-    class: Drupal\automatic_updates\Routing\RouteSubscriber
+  _defaults:
+    autowire: true
+
+  Drupal\automatic_updates\Routing\RouteSubscriber:
     tags:
       - { name: event_subscriber }
-  automatic_updates.readiness_validation_manager:
-    class: Drupal\automatic_updates\Validation\ReadinessValidationManager
+  Drupal\automatic_updates\Validation\StatusChecker:
     arguments:
-      - '@keyvalue.expirable'
-      - '@datetime.time'
-      - '@event_dispatcher'
-      - '@automatic_updates.updater'
-      - '@automatic_updates.cron_updater'
-      - 24
+      # @todo Remove this when https://drupal.org/i/3325557 lands.
+      $key_value_expirable_factory: '@keyvalue.expirable'
+      $resultsTimeToLive: 24
     tags:
       - { name: event_subscriber }
-  automatic_updates.updater:
-    class: Drupal\automatic_updates\Updater
-    arguments:
-      - '@config.factory'
-      - '@package_manager.path_locator'
-      - '@package_manager.beginner'
-      - '@package_manager.stager'
-      - '@package_manager.committer'
-      - '@file_system'
-      - '@event_dispatcher'
-      - '@tempstore.shared'
-      - '@datetime.time'
-  automatic_updates.cron_updater:
-    class: Drupal\automatic_updates\CronUpdater
-    arguments:
-      - '@automatic_updates.release_chooser'
-      - '@logger.factory'
-      - '@plugin.manager.mail'
-      - '@language_manager'
-      - '@state'
-      - '@config.factory'
-      - '@package_manager.path_locator'
-      - '@package_manager.beginner'
-      - '@package_manager.stager'
-      - '@package_manager.committer'
-      - '@file_system'
-      - '@event_dispatcher'
-      - '@tempstore.shared'
-      - '@datetime.time'
-  automatic_updates.staged_projects_validator:
-    class: Drupal\automatic_updates\Validator\StagedProjectsValidator
-    arguments:
-      - '@string_translation'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.release_chooser:
-    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'
+  Drupal\automatic_updates\StatusCheckMailer: ~
+  Drupal\automatic_updates\UpdateStage:
+    calls:
+      - ['setLogger', ['@logger.channel.automatic_updates']]
+  Drupal\automatic_updates\CronUpdateRunner:
+    calls:
+      - ['setLogger', ['@logger.channel.automatic_updates']]
+    decorates: 'cron'
+  Drupal\automatic_updates\Validator\RequestedUpdateValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates.validator.file_system_permissions:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.file_system'
+  Drupal\automatic_updates\Validator\StagedProjectsValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates.validator.multisite:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
+  Drupal\automatic_updates\ReleaseChooser: ~
+  Drupal\automatic_updates\Validator\CronFrequencyValidator:
     arguments:
-      - '@package_manager.validator.multisite'
+      $lock: '@lock'
     tags:
       - { name: event_subscriber }
-  automatic_updates.validator.symlink:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.symlink'
+  Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates.validator.patches:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.patches'
+  Drupal\automatic_updates\Validator\VersionPolicyValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates.cron_frequency_validator:
-    class: Drupal\automatic_updates\Validator\CronFrequencyValidator
-    arguments:
-      - '@config.factory'
-      - '@module_handler'
-      - '@state'
-      - '@datetime.time'
-      - '@string_translation'
-      - '@automatic_updates.cron_updater'
+  Drupal\automatic_updates\Validator\WindowsValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates.validator.staged_database_updates:
-    class: Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator
+  logger.channel.automatic_updates:
+    parent: logger.channel_base
+    arguments: ['automatic_updates']
+  Drupal\automatic_updates\ConsoleUpdateStage:
     arguments:
-      - '@package_manager.path_locator'
-      - '@extension.list.module'
-      - '@extension.list.theme'
-      - '@string_translation'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.xdebug:
-    class: Drupal\automatic_updates\Validator\XdebugValidator
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.version_policy:
-    class: Drupal\automatic_updates\Validator\VersionPolicyValidator
-    arguments:
-      - '@class_resolver'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.config_subscriber:
-    class: Drupal\automatic_updates\EventSubscriber\ConfigSubscriber
+      $lock: '@lock'
+      $committer: '@Drupal\automatic_updates\MaintenanceModeAwareCommitter'
+    calls:
+      - ['setLogger', ['@logger.channel.automatic_updates']]
+  Drupal\automatic_updates\MaintenanceModeAwareCommitter:
     tags:
       - { name: event_subscriber }
-  automatic_updates.validator.scaffold_file_permissions:
-    class: Drupal\automatic_updates\Validator\ScaffoldFilePermissionsValidator
+  Drupal\automatic_updates\CommandExecutor:
     arguments:
-      - '@package_manager.path_locator'
+      $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: ^9.3
-lifecycle: experimental
+core_version_requirement: ^10.1
 dependencies:
   - drupal: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/automatic_updates_extensions.services.yml

 services:
-  automatic_updates_extensions.updater:
-    class: Drupal\automatic_updates_extensions\ExtensionUpdater
-    arguments:
-      - '@config.factory'
-      - '@package_manager.path_locator'
-      - '@package_manager.beginner'
-      - '@package_manager.stager'
-      - '@package_manager.committer'
-      - '@file_system'
-      - '@event_dispatcher'
-      - '@tempstore.shared'
-      - '@datetime.time'
-  automatic_updates_extensions.validator.packages_installed_with_composer:
-    class: Drupal\automatic_updates_extensions\Validator\PackagesInstalledWithComposerValidator
-    arguments:
-      - '@string_translation'
+  _defaults:
+    autowire: true
+
+  Drupal\automatic_updates_extensions\ExtensionUpdateStage: ~
+  Drupal\automatic_updates_extensions\Validator\UpdateReleaseValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates_extensions.validator.packages_type:
-    class: Drupal\automatic_updates_extensions\Validator\UpdatePackagesTypeValidator
-    arguments:
-      - '@string_translation'
-      - '@extension.list.module'
-      - '@extension.list.theme'
+  Drupal\automatic_updates_extensions\Validator\ForbidCoreChangesValidator:
     tags:
       - { name: event_subscriber }
-  automatic_updates_extensions.validator.target_release:
-    class: Drupal\automatic_updates_extensions\Validator\UpdateReleaseValidator
+  Drupal\automatic_updates_extensions\Validator\RequestedUpdateValidator:
     tags:
       - { name: event_subscriber }

automatic_updates_extensions/src/BatchProcessor.php

 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\automatic_updates_extensions;
 
 use Drupal\Core\Url;
-use Drupal\package_manager\Exception\StageValidationException;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
@@ -23,13 +24,13 @@ final class BatchProcessor {
   public const STAGE_ID_SESSION_KEY = '_automatic_updates_extensions_stage_id';
 
   /**
-   * Gets the updater service.
+   * Gets the update stage service.
    *
-   * @return \Drupal\automatic_updates_extensions\ExtensionUpdater
-   *   The updater service.
+   * @return \Drupal\automatic_updates_extensions\ExtensionUpdateStage
+   *   The update stage service.
    */
-  protected static function getUpdater(): ExtensionUpdater {
-    return \Drupal::service('automatic_updates_extensions.updater');
+  private static function getStage(): ExtensionUpdateStage {
+    return \Drupal::service(ExtensionUpdateStage::class);
   }
 
   /**
@@ -44,40 +45,24 @@ final class BatchProcessor {
    *   The caught exception, which will always be re-thrown once its messages
    *   have been recorded.
    */
-  protected static function handleException(\Throwable $error, array &$context): void {
-    $error_messages = [
-      $error->getMessage(),
-    ];
-
-    if ($error instanceof StageValidationException) {
-      foreach ($error->getResults() as $result) {
-        $messages = $result->getMessages();
-        if (count($messages) > 1) {
-          array_unshift($messages, $result->getSummary());
-        }
-        $error_messages = array_merge($error_messages, $messages);
-      }
-    }
-
-    foreach ($error_messages as $error_message) {
-      $context['results']['errors'][] = $error_message;
-    }
+  private static function handleException(\Throwable $error, array &$context): void {
+    $context['results']['errors'][] = $error->getMessage();
     throw $error;
   }
 
   /**
-   * Calls the updater's begin() method.
+   * Calls the update stage's begin() method.
    *
    * @param string[] $project_versions
    *   The project versions to be staged in the update, keyed by package name.
    * @param array $context
    *   The current context of the batch job.
    *
-   * @see \Drupal\automatic_updates_extensions\ExtensionUpdater::begin()
+   * @see \Drupal\automatic_updates_extensions\ExtensionUpdateStage::begin()
    */
   public static function begin(array $project_versions, array &$context): void {
     try {
-      $stage_id = static::getUpdater()->begin($project_versions);
+      $stage_id = static::getStage()->begin($project_versions);
       \Drupal::service('session')->set(static::STAGE_ID_SESSION_KEY, $stage_id);
     }
     catch (\Throwable $e) {
@@ -86,37 +71,50 @@ final class BatchProcessor {
   }
 
   /**
-   * Calls the updater's stageVersions() method.
+   * Calls the update stage's stage() method.
    *
    * @param array $context
    *   The current context of the batch job.
    *
-   * @see \Drupal\automatic_updates\Updater::stage()
+   * @see \Drupal\automatic_updates\UpdateStage::stage()
    */
   public static function stage(array &$context): void {
+    $stage_id = \Drupal::service('session')->get(static::STAGE_ID_SESSION_KEY);
     try {
-      $stage_id = \Drupal::service('session')->get(static::STAGE_ID_SESSION_KEY);
-      static::getUpdater()->claim($stage_id)->stage();
+      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);
     }
   }
 
   /**
-   * Calls the updater's commit() method.
+   * Calls the update stage's apply() method.
    *
    * @param string $stage_id
    *   The stage ID.
    * @param array $context
    *   The current context of the batch job.
    *
-   * @see \Drupal\automatic_updates\Updater::apply()
+   * @see \Drupal\automatic_updates_extensions\ExtensionUpdateStage::apply()
    */
   public static function commit(string $stage_id, array &$context): void {
     try {
-      static::getUpdater()->claim($stage_id)->apply();
+      static::getStage()->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);
@@ -124,18 +122,18 @@ final class BatchProcessor {
   }
 
   /**
-   * Calls the updater's postApply() method.
+   * Calls the update stage's postApply() method.
    *
    * @param string $stage_id
    *   The stage ID.
    * @param array $context
    *   The current context of the batch job.
    *
-   * @see \Drupal\automatic_updates\Updater::postApply()
+   * @see \Drupal\automatic_updates\UpdateStage::postApply()
    */
   public static function postApply(string $stage_id, array &$context): void {
     try {
-      static::getUpdater()->claim($stage_id)->postApply();
+      static::getStage()->claim($stage_id)->postApply();
     }
     catch (\Throwable $e) {
       static::handleException($e, $context);
@@ -143,18 +141,18 @@ final class BatchProcessor {
   }
 
   /**
-   * Calls the updater's clean() method.
+   * Calls the update stage's destroy() method.
    *
    * @param string $stage_id
    *   The stage ID.
    * @param array $context
    *   The current context of the batch job.
    *
-   * @see \Drupal\automatic_updates\Updater::clean()
+   * @see \Drupal\automatic_updates_extensions\ExtensionUpdateStage::destroy()
    */
   public static function clean(string $stage_id, array &$context): void {
     try {
-      static::getUpdater()->claim($stage_id)->destroy();
+      static::getStage()->claim($stage_id)->destroy();
     }
     catch (\Throwable $e) {
       static::handleException($e, $context);
@@ -212,7 +210,7 @@ final class BatchProcessor {
    * @param array $results
    *   The batch results.
    */
-  protected static function handleBatchError(array $results): void {
+  private static function handleBatchError(array $results): void {
     if (isset($results['errors'])) {
       foreach ($results['errors'] as $error) {
         \Drupal::messenger()->addError($error);

automatic_updates_extensions/src/ExtensionUpdater.php → automatic_updates_extensions/src/ExtensionUpdateStage.php

 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\automatic_updates_extensions;
 
-use Drupal\automatic_updates\Exception\UpdateException;
-use Drupal\automatic_updates\LegacyVersionUtility;
-use Drupal\package_manager\Event\StageEvent;
-use Drupal\package_manager\Exception\StageValidationException;
-use Drupal\package_manager\Stage;
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Core\Queue\QueueFactory;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\TempStore\SharedTempStoreFactory;
+use Drupal\package_manager\ComposerInspector;
+use Drupal\package_manager\FailureMarker;
+use Drupal\package_manager\LegacyVersionUtility;
+use Drupal\package_manager\PathLocator;
+use Drupal\package_manager\StageBase;
+use PhpTuf\ComposerStager\API\Core\BeginnerInterface;
+use PhpTuf\ComposerStager\API\Core\CommitterInterface;
+use PhpTuf\ComposerStager\API\Core\StagerInterface;
+use PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Defines a service to perform updates for modules and themes.
@@ -15,7 +26,54 @@ use Drupal\package_manager\Stage;
  *   This class is an internal part of the module's update handling and
  *   should not be used by external code.
  */
-class ExtensionUpdater extends Stage {
+final class ExtensionUpdateStage extends StageBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected string $type = 'automatic_updates_extensions:attended';
+
+  /**
+   * Constructs a new ExtensionUpdateStage object.
+   *
+   * @param \Drupal\package_manager\ComposerInspector $composerInspector
+   *   The Composer inspector service.
+   * @param \Drupal\package_manager\PathLocator $pathLocator
+   *   The path locator service.
+   * @param \PhpTuf\ComposerStager\API\Core\BeginnerInterface $beginner
+   *   The beginner service.
+   * @param \PhpTuf\ComposerStager\API\Core\StagerInterface $stager
+   *   The stager service.
+   * @param \PhpTuf\ComposerStager\API\Core\CommitterInterface $committer
+   *   The committer 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
+   *   The shared tempstore factory.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
+   * @param \PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface $pathFactory
+   *   The path factory service.
+   * @param \Drupal\package_manager\FailureMarker $failureMarker
+   *   The failure marker service.
+   */
+  public function __construct(
+    protected readonly ComposerInspector $composerInspector,
+    PathLocator $pathLocator,
+    BeginnerInterface $beginner,
+    StagerInterface $stager,
+    CommitterInterface $committer,
+    QueueFactory $queueFactory,
+    EventDispatcherInterface $eventDispatcher,
+    SharedTempStoreFactory $tempStoreFactory,
+    TimeInterface $time,
+    PathFactoryInterface $pathFactory,
+    FailureMarker $failureMarker,
+  ) {
+    parent::__construct($pathLocator, $beginner, $stager, $committer, $queueFactory, $eventDispatcher, $tempStoreFactory, $time, $pathFactory, $failureMarker);
+  }
 
   /**
    * Begins the update.
@@ -33,19 +91,27 @@ class ExtensionUpdater extends Stage {
     if (empty($project_versions)) {
       throw new \InvalidArgumentException("No projects to begin the update");
     }
-    $composer = $this->getActiveComposer();
     $package_versions = [
       'production' => [],
       'dev' => [],
     ];
 
-    $require_dev = $composer->getComposer()
-      ->getPackage()
-      ->getDevRequires();
+    $project_root = $this->pathLocator->getProjectRoot();
+    $info = $this->composerInspector->getRootPackageInfo($project_root);
+    $installed_packages = $this->composerInspector->getInstalledPackagesList($project_root);
     foreach ($project_versions as $project_name => $version) {
-      $package = "drupal/$project_name";
-      $group = array_key_exists($package, $require_dev) ? 'dev' : 'production';
-      $package_versions[$group][$package] = LegacyVersionUtility::convertToSemanticVersion($version);
+      $package = $installed_packages->getPackageByDrupalProjectName($project_name);
+      if (empty($package)) {
+        throw new \InvalidArgumentException("The project $project_name is not a Drupal project known to Composer and cannot be updated.");
+      }
+
+      // We don't support updating install profiles.
+      if ($package->type === 'drupal-profile') {
+        throw new \InvalidArgumentException("The project $project_name cannot be updated because updating install profiles is not supported.");
+      }
+
+      $group = isset($info['devRequires'][$package->name]) ? 'dev' : 'production';
+      $package_versions[$group][$package->name] = LegacyVersionUtility::convertToSemanticVersion($version);
     }
 
     // Ensure that package versions are available to pre-create event
@@ -91,13 +157,8 @@ class ExtensionUpdater extends Stage {
   /**
    * {@inheritdoc}
    */
-  protected function dispatch(StageEvent $event, callable $on_error = NULL): void {
-    try {
-      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);
-    }
+  protected function getFailureMarkerMessage(): TranslatableMarkup {
+    return $this->t('Automatic updates failed to apply, and the site is in an indeterminate state. Consider restoring the code and database from a backup.');
   }
 
 }

automatic_updates_extensions/src/Form/UpdateReady.php

 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\automatic_updates_extensions\Form;
 
-use Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator;
+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;
 use Drupal\automatic_updates_extensions\BatchProcessor;
 use Drupal\automatic_updates\BatchProcessor as AutoUpdatesBatchProcessor;
-use Drupal\automatic_updates_extensions\ExtensionUpdater;
+use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
 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;
 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.
  *
  * @internal
- *   Form classes are internal.
+ *   Form classes are internal and should not be used by external code.
  */
-final class UpdateReady extends FormBase {
-
-  /**
-   * The updater service.
-   *
-   * @var \Drupal\automatic_updates_extensions\ExtensionUpdater
-   */
-  protected $updater;
-
-  /**
-   * The state service.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * The module list service.
-   *
-   * @var \Drupal\Core\Extension\ModuleExtensionList
-   */
-  protected $moduleList;
-
-  /**
-   * The staged database update validator service.
-   *
-   * @var \Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator
-   */
-  protected $stagedDatabaseUpdateValidator;
+final class UpdateReady extends UpdateFormBase {
 
   /**
    * Constructs a new UpdateReady object.
    *
-   * @param \Drupal\automatic_updates_extensions\ExtensionUpdater $updater
-   *   The updater service.
+   * @param \Drupal\automatic_updates_extensions\ExtensionUpdateStage $stage
+   *   The update stage service.
    * @param \Drupal\Core\Messenger\MessengerInterface $messenger
    *   The messenger service.
    * @param \Drupal\Core\State\StateInterface $state
    *   The state service.
-   * @param \Drupal\Core\Extension\ModuleExtensionList $module_list
+   * @param \Drupal\Core\Extension\ModuleExtensionList $moduleList
    *   The module list service.
-   * @param \Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator $staged_database_update_validator
-   *   The staged database update validator service.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer service.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
+   *   Event dispatcher service.
+   * @param \Drupal\package_manager\ComposerInspector $composerInspector
+   *   The Composer inspector service.
+   * @param \Drupal\package_manager\PathLocator $pathLocator
+   *   The path locator service.
    */
-  public function __construct(ExtensionUpdater $updater, MessengerInterface $messenger, StateInterface $state, ModuleExtensionList $module_list, StagedDatabaseUpdateValidator $staged_database_update_validator) {
-    $this->updater = $updater;
+  public function __construct(
+    private readonly ExtensionUpdateStage $stage,
+    MessengerInterface $messenger,
+    private readonly StateInterface $state,
+    private readonly ModuleExtensionList $moduleList,
+    private readonly RendererInterface $renderer,
+    private readonly EventDispatcherInterface $eventDispatcher,
+    private readonly ComposerInspector $composerInspector,
+    private readonly PathLocator $pathLocator,
+  ) {
     $this->setMessenger($messenger);
-    $this->state = $state;
-    $this->moduleList = $module_list;
-    $this->stagedDatabaseUpdateValidator = $staged_database_update_validator;
   }
 
   /**
@@ -86,11 +80,14 @@ final class UpdateReady extends FormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('automatic_updates_extensions.updater'),
+      $container->get(ExtensionUpdateStage::class),
       $container->get('messenger'),
       $container->get('state'),
       $container->get('extension.list.module'),
-      $container->get('automatic_updates.validator.staged_database_updates')
+      $container->get('renderer'),
+      $container->get('event_dispatcher'),
+      $container->get(ComposerInspector::class),
+      $container->get(PathLocator::class),
     );
   }
 
@@ -99,26 +96,19 @@ final class UpdateReady extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, string $stage_id = NULL) {
     try {
-      $this->updater->claim($stage_id);
+      $this->stage->claim($stage_id);
     }
-    catch (StageOwnershipException $e) {
+    catch (StageOwnershipException) {
       $this->messenger()->addError($this->t('Cannot continue the update because another Composer operation is currently in progress.'));
       return $form;
     }
+    catch (StageFailureMarkerException $e) {
+      $this->messenger()->addError($e->getMessage());
+      return $form;
+    }
 
     $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) {
-      $messages[MessengerInterface::TYPE_WARNING][] = $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.');
-      foreach ($pending_updates as $pending_update) {
-        $messages[MessengerInterface::TYPE_WARNING][] = $pending_update;
-      }
-    }
-
     // 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()) {
@@ -141,12 +131,14 @@ final class UpdateReady extends FormBase {
       '#type' => 'value',
       '#value' => $stage_id,
     ];
-
-    // @todo Display the project versions that will be update including any
-    //   dependencies that are Drupal projects.
+    $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'] = [
@@ -154,6 +146,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->stage, $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'),
@@ -192,7 +196,7 @@ final class UpdateReady extends FormBase {
    */
   public function cancel(array &$form, FormStateInterface $form_state): void {
     try {
-      $this->updater->destroy();
+      $this->stage->destroy();
       $this->messenger()->addStatus($this->t('The update was successfully cancelled.'));
       $form_state->setRedirect('automatic_updates_extensions.report_update');
     }
@@ -201,4 +205,115 @@ final class UpdateReady extends FormBase {
     }
   }
 
+  /**
+   * Displays all projects that will be updated.
+   *
+   * @return mixed[][]
+   *   A render array displaying packages that will be updated.
+   */
+  private function showUpdates(): array {
+    // Get packages that were updated in the stage directory.
+    $installed_packages = $this->composerInspector->getInstalledPackagesList($this->pathLocator->getProjectRoot());
+    $staged_packages = $this->composerInspector->getInstalledPackagesList($this->stage->getStageDirectory());
+    $updated_packages = $staged_packages->getPackagesWithDifferentVersionsIn($installed_packages);
+
+    // Build a list of package names that were updated by user request.
+    $updated_by_request = [];
+    foreach ($this->stage->getPackageVersions() as $group) {
+      $updated_by_request = array_merge($updated_by_request, array_keys($group));
+    }
+
+    $updated_by_request_info = [];
+    $updated_project_info = [];
+    $supported_package_types = ['drupal-module', 'drupal-theme'];
+
+    // Compile an array of relevant information about the packages that will be
+    // updated.
+    foreach ($updated_packages as $name => $updated_package) {
+      // Ignore anything that isn't a module or a theme.
+      if (!in_array($updated_package->type, $supported_package_types, TRUE)) {
+        continue;
+      }
+      $updated_project_info[$name] = [
+        'title' => $this->getProjectTitleFromPackage($updated_package),
+        'installed_version' => $installed_packages[$updated_package->name]->version,
+        'updated_version' => $updated_package->version,
+      ];
+    }
+
+    foreach ($updated_packages as $name => $updated_package) {
+      // Sort the updated packages into two groups: the ones that were updated
+      // at the request of the user, and the ones that got updated anyway
+      // (probably due to Composer's dependency resolution).
+      if (in_array($name, $updated_by_request, TRUE)) {
+        $updated_by_request_info[$name] = $updated_project_info[$name];
+        unset($updated_project_info[$name]);
+      }
+    }
+    $output = [];
+    if ($updated_by_request_info) {
+      // Create the list of messages for the packages updated by request.
+      $output['requested'] = $this->getUpdatedPackagesItemList($updated_by_request_info, $this->t('The following projects will be updated:'));
+    }
+
+    if ($updated_project_info) {
+      // Create the list of messages for packages that were updated
+      // incidentally.
+      $output['dependencies'] = $this->getUpdatedPackagesItemList($updated_project_info, $this->t('The following dependencies will also be updated:'));
+    }
+    return $output;
+  }
+
+  /**
+   * Gets the human-readable project title for a Composer package.
+   *
+   * @param \Drupal\package_manager\InstalledPackage $package
+   *   The installed package.
+   *
+   * @return string
+   *   The human-readable title of the project. If no project information is
+   *   available, the package name is returned.
+   */
+  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 $package->name;
+    }
+  }
+
+  /**
+   * Generates an item list of packages that will be updated.
+   *
+   * @param array[] $updated_packages
+   *   An array of packages that will be updated, each sub-array containing the
+   *   project title, installed version, and target version.
+   * @param \Drupal\Core\StringTranslation\TranslatableMarkup $item_list_title
+   *   The title of the generated item list.
+   *
+   * @return array
+   *   A render array for the generated item list.
+   */
+  private function getUpdatedPackagesItemList(array $updated_packages, TranslatableMarkup $item_list_title): array {
+    $create_message_for_project = function (array $project): TranslatableMarkup {
+      return $this->t('@title from @from_version to @to_version', [
+        '@title' => $project['title'],
+        '@from_version' => $project['installed_version'],
+        '@to_version' => $project['updated_version'],
+      ]);
+    };
+    return [
+      '#theme' => 'item_list',
+      '#prefix' => '<p>' . $item_list_title . '</p>',
+      '#items' => array_map($create_message_for_project, $updated_packages),
+    ];
+  }
+
 }

automatic_updates_extensions/src/Form/UpdaterForm.php

 <?php
 
+declare(strict_types = 1);
+
 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\automatic_updates_extensions\ExtensionUpdateStage;
 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;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Url;
+use Drupal\package_manager\ComposerInspector;
+use Drupal\package_manager\Exception\StageFailureMarkerException;
+use Drupal\package_manager\FailureMarker;
+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;
@@ -22,70 +29,52 @@ 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 FormBase {
-
-  use ReadinessTrait;
-
-  /**
-   * The extension updater service.
-   *
-   * @var \Drupal\automatic_updates_extensions\ExtensionUpdater
-   */
-  private $extensionUpdater;
-
-  /**
-   * The event dispatcher service.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  private $eventDispatcher;
-
-  /**
-   * The state service.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  private $state;
-
-  /**
-   * The renderer service.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  private $renderer;
+final class UpdaterForm extends UpdateFormBase {
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('automatic_updates_extensions.updater'),
+      $container->get(ExtensionUpdateStage::class),
       $container->get('event_dispatcher'),
       $container->get('renderer'),
-      $container->get('state')
+      $container->get('state'),
+      $container->get(FailureMarker::class),
+      $container->get(ComposerInspector::class),
+      $container->get(PathLocator::class),
     );
   }
 
   /**
    * Constructs a new UpdaterForm object.
    *
-   * @param \Drupal\automatic_updates_extensions\ExtensionUpdater $extension_updater
-   *   The extension updater service.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
+   * @param \Drupal\automatic_updates_extensions\ExtensionUpdateStage $stage
+   *   The extension update stage service.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
    *   The extension event dispatcher service.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer service.
    * @param \Drupal\Core\State\StateInterface $state
    *   The state service.
+   * @param \Drupal\package_manager\FailureMarker $failureMarker
+   *   The failure marker service.
+   * @param \Drupal\package_manager\ComposerInspector $composerInspector
+   *   The Composer inspector service.
+   * @param \Drupal\package_manager\PathLocator $pathLocator
+   *   The path locator service.
    */
-  public function __construct(ExtensionUpdater $extension_updater, EventDispatcherInterface $event_dispatcher, RendererInterface $renderer, StateInterface $state) {
-    $this->extensionUpdater = $extension_updater;
-    $this->eventDispatcher = $event_dispatcher;
-    $this->renderer = $renderer;
-    $this->state = $state;
-  }
+  public function __construct(
+    private readonly ExtensionUpdateStage $stage,
+    private readonly EventDispatcherInterface $eventDispatcher,
+    private readonly RendererInterface $renderer,
+    private readonly StateInterface $state,
+    private readonly FailureMarker $failureMarker,
+    private readonly ComposerInspector $composerInspector,
+    private readonly PathLocator $pathLocator,
+  ) {}
 
   /**
    * {@inheritdoc}
@@ -98,6 +87,13 @@ final class UpdaterForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
+    try {
+      $this->failureMarker->assertNotExists();
+    }
+    catch (StageFailureMarkerException $e) {
+      $this->messenger()->addError($e->getMessage());
+      return $form;
+    }
     $update_projects = $this->getRecommendedModuleUpdates();
     $options = [];
     $recommended_versions = [];
@@ -115,10 +111,16 @@ final class UpdaterForm extends FormBase {
         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'];
     }
@@ -137,19 +139,17 @@ final class UpdaterForm extends FormBase {
       '#empty' => $this->t('There are no available updates.'),
       '#attributes' => ['class' => ['update-recommended']],
       '#required' => TRUE,
-      '#required_error' => t('Please select one or more projects.'),
+      '#required_error' => t('Select one or more projects.'),
     ];
 
     if ($form_state->getUserInput()) {
       $results = [];
     }
     else {
-      $event = new ReadinessCheckEvent($this->extensionUpdater);
-      $this->eventDispatcher->dispatch($event);
-      $results = $event->getResults();
+      $results = $this->runStatusCheck($this->stage, $this->eventDispatcher);
     }
-    $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);
@@ -171,9 +171,9 @@ final class UpdaterForm extends FormBase {
    * @return mixed[][]
    *   The form's actions elements.
    */
-  protected function actions(FormStateInterface $form_state): array {
+  private function actions(FormStateInterface $form_state): array {
     $actions = ['#type' => 'actions'];
-    if (!$this->extensionUpdater->isAvailable()) {
+    if (!$this->stage->isAvailable()) {
       // If the form has been submitted do not display this error message
       // because ::deleteExistingUpdate() may run on submit. The message will
       // still be displayed on form build if needed.
@@ -199,7 +199,7 @@ final class UpdaterForm extends FormBase {
    * Submit function to delete an existing in-progress update.
    */
   public function deleteExistingUpdate(): void {
-    $this->extensionUpdater->destroy(TRUE);
+    $this->stage->destroy(TRUE);
     $this->messenger()->addMessage($this->t("Staged update deleted"));
   }
 
@@ -232,28 +232,33 @@ final class UpdaterForm extends FormBase {
    *   Modules that require updates.
    */
   private function getRecommendedModuleUpdates(): array {
+    $supported_project_types = [
+      "module", "module-disabled", "theme", "theme-disabled",
+    ];
     $available_updates = update_get_available(TRUE);
     if (empty($available_updates)) {
       $this->messenger()->addError('There was a problem getting update information. Try again later.');
       return [];
     }
 
-    $project_data = update_calculate_project_data($available_updates);
+    $all_projects_data = update_calculate_project_data($available_updates);
     $outdated_modules = [];
-    $installed_packages = array_keys($this->extensionUpdater->getActiveComposer()->getInstalledPackages());
+    $installed_packages = $this->composerInspector->getInstalledPackagesList($this->pathLocator->getProjectRoot());
     $non_supported_update_statuses = [];
-    foreach ($project_data as $project_name => $project_info) {
-      if ($project_info['project_type'] === 'module' || $project_info['project_type'] === 'module-disabled') {
-        if ($project_info['status'] !== UpdateManagerInterface::CURRENT) {
-          if (!in_array("drupal/$project_name", $installed_packages, TRUE)) {
-            $non_supported_update_statuses[] = $project_info['status'];
+    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 ($installed_packages->getPackageByDrupalProjectName($project_name) === NULL) {
+            $non_supported_update_statuses[] = $project_data['status'];
             continue;
           }
-          if (!empty($project_info['recommended'])) {
-            $outdated_modules[$project_name] = $project_info;
+          $project_information = new ProjectInfo($project_name);
+          $installable_versions = array_keys($project_information->getInstallableReleases());
+          if (!empty($project_data['recommended']) && in_array($project_data['recommended'], $installable_versions, TRUE)) {
+            $outdated_modules[$project_name] = $project_data;
           }
           else {
-            $non_supported_update_statuses[] = $project_info['status'];
+            $non_supported_update_statuses[] = $project_data['status'];
           }
         }
       }
@@ -284,7 +289,6 @@ final class UpdaterForm extends FormBase {
           $message_status
         );
       }
-
     }
     return $outdated_modules;
   }