.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

@@ -7,7 +7,7 @@ A simple setup is enough for most users to start contributing to Automatic Updat
 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/8.x-2.x/scripts/setup_local_dev.sh)"
+/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.
@@ -30,18 +30,13 @@ That's it. The success message will display next steps.
 * 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 created during setup below contains any, 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).<br>
-  <br>
-  To scan for symbolic links, run `find . -type l` from the Drupal core repository root. If you find any, try to identify their source and eliminate it (for example, by removing a Composer library that places them).
-
 ### 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).
 
 ```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="8.x-2.x" # The branch of the Automatic Updates module that will be installed.
+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.
 ```
@@ -59,7 +54,7 @@ git fetch --unshallow
 You can download the setup script first to review its contents or modify it before running it:
 
 ```shell
-curl --output setup_local_dev.sh https://git.drupalcode.org/project/automatic_updates/-/raw/8.x-2.x/scripts/setup_local_dev.sh
+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
 ```
@@ -82,7 +77,7 @@ To set up your environment manually, use the setup script as a reference.
 
 ---
 
-<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/8.x-2.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-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),

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
 

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.7 || ^10.1
+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\CronUpdater;
+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.updater')->destroy(TRUE);
+  \Drupal::service(UpdateStage::class)->destroy(TRUE);
 }
 
 /**
@@ -30,41 +31,24 @@ 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('cron') !== CronUpdater::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,
         '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;
   }
 }
 
-/**
- * Stores cached readiness check results under a new key.
- */
-function automatic_updates_update_9001(): void {
-  /** @var \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface $key_value */
-  $key_value = \Drupal::service('keyvalue.expirable')
-    ->get('automatic_updates');
-  $key_value->rename('readiness_validation_last_run', 'status_check_last_run');
-  $key_value->rename('readiness_check_timestamp', 'status_check_timestamp');
-}
+// BEGIN: DELETE FROM CORE MERGE REQUEST
 
 /**
- * Sets cron setting to \Drupal\automatic_updates\CronUpdater::DISABLED.
- *
- * This is necessary until TUF support is available on drupal.org. This used to
- * be hardcoded, but that caused complex race conditions in tests. Hence, it is
- * now just configured.
- *
- * @see automatic_updates_requirements()
- * @see https://www.drupal.org/project/automatic_updates/issues/3284443
+ * Implements hook_update_last_removed().
  */
-function automatic_updates_update_9002(): void {
-  /** @var \Drupal\Core\Config\Config $config */
-  $config = \Drupal::service('config.factory')->getEditable('automatic_updates.settings');
-  $config->set('cron', CronUpdater::DISABLED)->save();
+function automatic_updates_update_last_removed(): int {
+  return 9002;
 }
+
+// END: DELETE FROM CORE MERGE REQUEST

automatic_updates.module

@@ -8,11 +8,16 @@
 declare(strict_types = 1);
 
 use Drupal\automatic_updates\BatchProcessor;
-use Drupal\automatic_updates\CronUpdater;
+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;
 
 /**
@@ -32,11 +37,6 @@ function automatic_updates_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<p>' . t('Additionally, Automatic Updates periodically runs checks to ensure that updates can be installed, and will warn site administrators if problems are detected.') . '</p>';
       $output .= '<h3>' . t('Requirements') . '</h3>';
       $output .= '<p>' . t('Automatic Updates requires a Composer executable whose version satisfies <code>@version</code>, and PHP must have permission to run it. The path to the executable may be set in the <code>package_manager.settings:executables.composer</code> config setting, or it will be automatically detected.', ['@version' => ComposerInspector::SUPPORTED_VERSION]) . '</p>';
-      $output .= '<p id="cron-alternate-port">' . t('If your site is running on the built-in PHP web server, unattended (i.e., cron) updates may not work without one of the following workarounds:') . '</p>';
-      $output .= '<ul>';
-      $output .= '<li>' . t('Use a multithreaded web server, such as Apache, NGINX, or on Windows, IIS.') . '</li>';
-      $output .= '<li>' . t('Run another instance of the built-in PHP web server on a different port and configure automatic updates accordingly: <code>$config["automatic_updates.settings"]["cron_port"] = $alternate_port_number;</code>') . '</li>';
-      $output .= '</ul>';
       $output .= '<p>' . t('For more information, see the <a href=":automatic-updates-documentation">online documentation for the Automatic Updates module</a>.', [':automatic-updates-documentation' => 'https://www.drupal.org/docs/8/update/automatic-updates']) . '</p>';
       $output .= '<h3 id="minor-update">' . t('Updating to another minor version of Drupal') . '</h3>';
       $output .= '<p>';
@@ -104,7 +104,7 @@ function automatic_updates_mail(string $key, array &$message, array $params): vo
     $url = Url::fromRoute('system.status')
       ->setAbsolute()
       ->toString();
-    $message['body'][] = t('Your site has failed some readiness checks for automatic updates and may not be able to receive automatic updates until further action is taken. Please visit @url for more information.', [
+    $message['body'][] = t('Your site has failed some readiness checks for automatic updates and may not be able to receive automatic updates until further action is taken. Visit @url for more information.', [
       '@url' => $url,
     ], $options);
   }
@@ -112,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);
   }
 }
@@ -120,17 +120,30 @@ 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();
 
   // @todo Rely on the route option after https://www.drupal.org/i/3236497 is
   //   committed.
-  // @todo Remove 'system.batch_page.html' after
-  //   https://www.drupal.org/i/3238311 is committed.
   $skip_routes = [
-    'system.batch_page.html',
     'automatic_updates.confirmation_page',
     'automatic_updates.report_update',
     'automatic_updates.module_update',
@@ -155,42 +168,6 @@ function automatic_updates_module_implements_alter(&$implementations, $hook) {
     // own routes to avoid these messages while an update is in progress.
     unset($implementations['update']);
   }
-  if ($hook === 'cron') {
-    $hook = $implementations['automatic_updates'];
-    unset($implementations['automatic_updates']);
-    $implementations['automatic_updates'] = $hook;
-  }
-}
-
-/**
- * Implements hook_cron().
- */
-function automatic_updates_cron() {
-  // @todo Refactor this after https://www.drupal.org/project/drupal/issues/2969056
-  // @todo Remove this after https://www.drupal.org/project/drupal/issues/3318964
-  if (defined('MAINTENANCE_MODE') || stripos($_SERVER['PHP_SELF'], 'update.php') !== FALSE) {
-    return;
-  }
-
-  /** @var \Drupal\automatic_updates\CronUpdater $updater */
-  $updater = \Drupal::service('automatic_updates.cron_updater');
-  $updater->handleCron();
-
-  /** @var \Drupal\automatic_updates\Validation\StatusChecker $status_checker */
-  $status_checker = \Drupal::service('automatic_updates.status_checker');
-  $last_results = $status_checker->getResults();
-  $last_run_time = $status_checker->getLastRunTime();
-  // Do not run status checks more than once an hour unless there are no results
-  // available.
-  if ($last_results === NULL || !$last_run_time || \Drupal::time()->getRequestTime() - $last_run_time > 3600) {
-    $status_checker->run();
-  }
-
-  // Only try to send failure notifications if unattended updates are enabled.
-  if ($updater->getMode() !== CronUpdater::DISABLED) {
-    \Drupal::service('automatic_updates.status_check_mailer')
-      ->sendFailureNotifications($last_results, $status_checker->getResults());
-  }
 }
 
 /**
@@ -200,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\CronUpdater $cron_updater */
-  $cron_updater = \Drupal::service('automatic_updates.cron_updater');
+  /** @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 ($cron_updater->getMode() === CronUpdater::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();
@@ -221,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();
 }
 
@@ -238,6 +215,61 @@ function automatic_updates_batch_alter(array &$batch): void {
   }
 }
 
+/**
+ * Implements hook_form_FORM_ID_alter() for update_settings.
+ */
+function automatic_updates_form_update_settings_alter(array &$form): void {
+  $config = \Drupal::config('automatic_updates.settings');
+
+  $form['unattended_level'] = [
+    '#type' => 'radios',
+    '#title' => t('Unattended background updates'),
+    '#options' => [
+      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.'),
+  ];
+  $form['unattended_method'] = [
+    '#type' => 'radios',
+    '#title' => t('How unattended updates should be run'),
+    '#options' => [
+      'web' => t('By using the Automated Cron module or a request to /system/cron'),
+      'console' => t('By the <code>auto-update</code> command-line utility'),
+    ],
+    '#default_value' => $config->get('unattended.method'),
+    '#states' => [
+      'invisible' => [
+        'input[name="unattended_level"]' => [
+          'value' => CronUpdateRunner::DISABLED,
+        ],
+      ],
+    ],
+    '#description' => t('To use the <code>/system/cron</code> method <a href="http://drupal.org/docs/user_guide/en/security-cron.html">ensure cron is set up correctly</a>.'),
+  ];
+  $form['#submit'][] = '_automatic_updates_submit_update_settings';
+}
+
+/**
+ * Saves settings for unattended updates.
+ *
+ * @param array $form
+ *   The complete form structure.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ *   The form state.
+ */
+function _automatic_updates_submit_update_settings(array &$form, FormStateInterface $form_state): void {
+  \Drupal::configFactory()
+    ->getEditable('automatic_updates.settings')
+    ->set('unattended', [
+      'method' => $form_state->getValue('unattended_method'),
+      'level' => $form_state->getValue('unattended_level'),
+    ])
+    ->save();
+}
+
 /**
  * Implements hook_preprocess_update_project_status().
  */
@@ -246,22 +278,22 @@ function automatic_updates_preprocess_update_project_status(array &$variables) {
   if ($project['name'] !== 'drupal') {
     return;
   }
-  $updater = \Drupal::service('automatic_updates.updater');
+  $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($updater)) {
+    if ($installed_minor_release = $recommender->getLatestInInstalledMinor($stage)) {
       $supported_target_versions[] = $installed_minor_release->getVersion();
     }
-    if ($next_minor_release = $recommender->getLatestInNextMinor($updater)) {
+    if ($next_minor_release = $recommender->getLatestInNextMinor($stage)) {
       $supported_target_versions[] = $next_minor_release->getVersion();
     }
   }
   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.post_update.php

@@ -3,18 +3,17 @@
 /**
  * @file
  * Contains post-update hooks for Automatic Updates.
+ *
+ * DELETE THIS FILE FROM CORE MERGE REQUEST.
  */
 
 declare(strict_types = 1);
 
-use Drupal\automatic_updates\StatusCheckMailer;
-
 /**
- * Creates the automatic_updates.settings:status_check_mail config.
+ * Implements hook_removed_post_updates().
  */
-function automatic_updates_post_update_create_status_check_mail_config(): void {
-  \Drupal::configFactory()
-    ->getEditable('automatic_updates.settings')
-    ->set('status_check_mail', StatusCheckMailer::ERRORS_ONLY)
-    ->save();
+function automatic_updates_removed_post_updates(): array {
+  return [
+    'automatic_updates_post_update_create_status_check_mail_config' => '3.0.0',
+  ];
 }

automatic_updates.routing.yml

@@ -27,9 +27,3 @@ automatic_updates.finish:
   options:
     _maintenance_access: TRUE
     _automatic_updates_status_messages: skip
-automatic_updates.cron.post_apply:
-  path: '/automatic-update/cron/post-apply/{stage_id}/{installed_version}/{target_version}/{key}'
-  defaults:
-    _controller: 'automatic_updates.cron_updater:handlePostApply'
-  requirements:
-    _access_system_cron: 'TRUE'

automatic_updates.services.yml

@@ -2,70 +2,60 @@ 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.updater:
-    class: Drupal\automatic_updates\Updater
+  Drupal\automatic_updates\StatusCheckMailer: ~
+  Drupal\automatic_updates\UpdateStage:
     calls:
       - ['setLogger', ['@logger.channel.automatic_updates']]
-  Drupal\automatic_updates\Updater: '@automatic_updates.updater'
-  automatic_updates.cron_updater:
-    class: Drupal\automatic_updates\CronUpdater
+  Drupal\automatic_updates\CronUpdateRunner:
     calls:
       - ['setLogger', ['@logger.channel.automatic_updates']]
-  Drupal\automatic_updates\CronUpdater: '@automatic_updates.cron_updater'
-  automatic_updates.requested_update_validator:
-    class: Drupal\automatic_updates\Validator\RequestedUpdateValidator
+    decorates: 'cron'
+  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
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.version_policy:
-    class: Drupal\automatic_updates\Validator\VersionPolicyValidator
+  Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\automatic_updates\Validator\VersionPolicyValidator: '@automatic_updates.validator.version_policy'
-  automatic_updates.validator.scaffold_file_permissions:
-    class: Drupal\automatic_updates\Validator\ScaffoldFilePermissionsValidator
+  Drupal\automatic_updates\Validator\VersionPolicyValidator:
     tags:
       - { name: event_subscriber }
-  Drupal\automatic_updates\Validator\ScaffoldFilePermissionsValidator: '@automatic_updates.validator.scaffold_file_permissions'
-  automatic_updates.validator.cron_server:
-    class: Drupal\automatic_updates\Validator\CronServerValidator
+  Drupal\automatic_updates\Validator\WindowsValidator:
     tags:
       - { name: event_subscriber }
   logger.channel.automatic_updates:
     parent: logger.channel_base
     arguments: ['automatic_updates']
+  Drupal\automatic_updates\ConsoleUpdateStage:
+    arguments:
+      $lock: '@lock'
+      $committer: '@Drupal\automatic_updates\MaintenanceModeAwareCommitter'
+    calls:
+      - ['setLogger', ['@logger.channel.automatic_updates']]
+  Drupal\automatic_updates\MaintenanceModeAwareCommitter:
+    tags:
+      - { name: event_subscriber }
+  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: ^9.7 || ^10.1
-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.updater:
-    class: Drupal\automatic_updates_extensions\ExtensionUpdater
-  Drupal\automatic_updates_extensions\ExtensionUpdater: '@automatic_updates_extensions.updater'
-  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

@@ -24,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);
   }
 
   /**
@@ -45,24 +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 {
+  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) {
@@ -71,37 +71,41 @@ 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 {
-      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
@@ -118,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);
@@ -137,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);
@@ -206,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

@@ -5,18 +5,18 @@ 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;
 use Drupal\package_manager\FailureMarker;
 use Drupal\package_manager\LegacyVersionUtility;
 use Drupal\package_manager\PathLocator;
-use Drupal\package_manager\Stage;
-use PhpTuf\ComposerStager\Domain\Core\Beginner\BeginnerInterface;
-use PhpTuf\ComposerStager\Domain\Core\Committer\CommitterInterface;
-use PhpTuf\ComposerStager\Domain\Core\Stager\StagerInterface;
-use PhpTuf\ComposerStager\Infrastructure\Factory\Path\PathFactoryInterface;
+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;
 
 /**
@@ -26,48 +26,53 @@ 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 ExtensionUpdater extends Stage {
+final class ExtensionUpdateStage extends StageBase {
 
   /**
-   * Constructs a new ExtensionUpdater object.
+   * {@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\Domain\Core\Beginner\BeginnerInterface $beginner
+   * @param \PhpTuf\ComposerStager\API\Core\BeginnerInterface $beginner
    *   The beginner service.
-   * @param \PhpTuf\ComposerStager\Domain\Core\Stager\StagerInterface $stager
+   * @param \PhpTuf\ComposerStager\API\Core\StagerInterface $stager
    *   The stager service.
-   * @param \PhpTuf\ComposerStager\Domain\Core\Committer\CommitterInterface $committer
+   * @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
    *   The shared tempstore factory.
    * @param \Drupal\Component\Datetime\TimeInterface $time
    *   The time service.
-   * @param \PhpTuf\ComposerStager\Infrastructure\Factory\Path\PathFactoryInterface $pathFactory
+   * @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 ComposerInspector $composerInspector,
+    protected readonly ComposerInspector $composerInspector,
     PathLocator $pathLocator,
     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,12 +7,13 @@ 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;
 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\FormStateInterface;
@@ -30,15 +31,15 @@ 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 {
 
   /**
    * 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
@@ -55,14 +56,14 @@ final class UpdateReady extends UpdateFormBase {
    *   The path locator service.
    */
   public function __construct(
-    private ExtensionUpdater $updater,
+    private readonly ExtensionUpdateStage $stage,
     MessengerInterface $messenger,
-    private StateInterface $state,
-    private ModuleExtensionList $moduleList,
-    private RendererInterface $renderer,
-    private EventDispatcherInterface $eventDispatcher,
-    private ComposerInspector $composerInspector,
-    private PathLocator $pathLocator,
+    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);
   }
@@ -79,14 +80,14 @@ final class UpdateReady extends UpdateFormBase {
    */
   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('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),
     );
   }
 
@@ -95,7 +96,7 @@ final class UpdateReady extends UpdateFormBase {
    */
   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) {
       $this->messenger()->addError($this->t('Cannot continue the update because another Composer operation is currently in progress.'));
@@ -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'] = [
@@ -144,7 +149,7 @@ final class UpdateReady extends UpdateFormBase {
 
     // Don't run the status checks once the form has been submitted.
     if (!$form_state->getUserInput()) {
-      $results = $this->runStatusCheck($this->updater, $this->eventDispatcher);
+      $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
@@ -191,7 +196,7 @@ final class UpdateReady extends UpdateFormBase {
    */
   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');
     }
@@ -209,12 +214,12 @@ final class UpdateReady extends UpdateFormBase {
   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->updater->getStageDirectory());
+    $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->updater->getPackageVersions() as $group) {
+    foreach ($this->stage->getPackageVersions() as $group) {
       $updated_by_request = array_merge($updated_by_request, array_keys($group));
     }
 
@@ -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

@@ -6,7 +6,7 @@ namespace Drupal\automatic_updates_extensions\Form;
 
 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\FormStateInterface;
 use Drupal\Core\State\StateInterface;
@@ -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,21 +38,21 @@ final class UpdaterForm extends UpdateFormBase {
    */
   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('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),
     );
   }
 
   /**
    * Constructs a new UpdaterForm object.
    *
-   * @param \Drupal\automatic_updates_extensions\ExtensionUpdater $extensionUpdater
-   *   The extension updater service.
+   * @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
@@ -66,13 +67,13 @@ final class UpdaterForm extends UpdateFormBase {
    *   The path locator service.
    */
   public function __construct(
-    private ExtensionUpdater $extensionUpdater,
-    private EventDispatcherInterface $eventDispatcher,
-    private RendererInterface $renderer,
-    private StateInterface $state,
-    private FailureMarker $failureMarker,
-    private ComposerInspector $composerInspector,
-    private PathLocator $pathLocator,
+    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,
   ) {}
 
   /**
@@ -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'];
     }
@@ -132,14 +139,14 @@ final class UpdaterForm extends UpdateFormBase {
       '#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 {
-      $results = $this->runStatusCheck($this->extensionUpdater, $this->eventDispatcher);
+      $results = $this->runStatusCheck($this->stage, $this->eventDispatcher);
     }
     $this->displayResults($results, $this->renderer);
     $security_level = ValidationResult::getOverallSeverity($results);
@@ -164,9 +171,9 @@ final class UpdaterForm extends UpdateFormBase {
    * @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.
@@ -192,7 +199,7 @@ final class UpdaterForm extends UpdateFormBase {
    * 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"));
   }
 
@@ -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\ExtensionUpdater;
 use Drupal\package_manager\LegacyVersionUtility;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\package_manager\Event\PreCreateEvent;
@@ -20,7 +19,8 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  *   This class is an internal part of the module's update handling and
  *   should not be used by external code.
  *
- * @todo Remove this validator completely in https://www.drupal.org/i/3307369.
+ * @todo Decide if this validator can be removed completely in
+ *    https://www.drupal.org/i/3351091.
  */
 final class UpdateReleaseValidator implements EventSubscriberInterface {
 
@@ -35,8 +35,8 @@ final class UpdateReleaseValidator implements EventSubscriberInterface {
    *   The path locator service.
    */
   public function __construct(
-    private ComposerInspector $composerInspector,
-    private PathLocator $pathLocator
+    private readonly ComposerInspector $composerInspector,
+    private readonly PathLocator $pathLocator
   ) {}
 
   /**
@@ -56,7 +56,7 @@ final class UpdateReleaseValidator implements EventSubscriberInterface {
    *   TRUE if the given version of the project is supported, otherwise FALSE.
    *   given version is not supported will return FALSE.
    */
-  protected function isSupportedRelease(string $name, string $semantic_version): bool {
+  private function isSupportedRelease(string $name, string $semantic_version): bool {
     $supported_releases = (new ProjectInfo($name))->getInstallableReleases();
     if (!$supported_releases) {
       return FALSE;
@@ -88,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 ExtensionUpdater) {
+    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>