.cspell.json

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

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.
@@ -26,7 +26,7 @@ That's it. The success message will display next steps.
 
 ### System requirements
 * A *nix-based operating system, such as Linux or macOS.
-* PHP 7.4 or later.
+* Drupal 10 or later.
 * Composer 2 or later. (Automatic Updates is not compatible with Composer 1.)
 * Git must be installed.
 
@@ -39,25 +39,27 @@ That's it. The success message will display next steps.
 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="9.5.x" # The branch of Drupal core that will be installed.
+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.
 ```
 
 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
 git fetch --unshallow
 ```
+// cSpell:enable
 
 ### Alternative setup options
 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
 ```
@@ -80,7 +82,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),

automatic_updates.info.yml

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

automatic_updates.install

@@ -7,7 +7,7 @@
 
 declare(strict_types = 1);
 
-use Drupal\automatic_updates\CronUpdater;
+use Drupal\automatic_updates\CronUpdateStage;
 use Drupal\automatic_updates\Validation\StatusCheckRequirements;
 use Drupal\system\SystemManager;
 
@@ -15,7 +15,7 @@ use Drupal\system\SystemManager;
  * Implements hook_uninstall().
  */
 function automatic_updates_uninstall() {
-  \Drupal::service('automatic_updates.updater')->destroy(TRUE);
+  \Drupal::service('automatic_updates.update_stage')->destroy(TRUE);
 }
 
 /**
@@ -30,7 +30,7 @@ function automatic_updates_requirements($phase) {
 
     // Check that site has cron updates enabled or not.
     // @todo Remove in https://www.drupal.org/project/automatic_updates/issues/3284443
-    if (\Drupal::configFactory()->get('automatic_updates.settings')->get('cron') !== CronUpdater::DISABLED) {
+    if (\Drupal::configFactory()->get('automatic_updates.settings')->get('cron') !== CronUpdateStage::DISABLED) {
       $requirements['automatic_updates_cron'] = [
         'title' => t('Cron installs updates automatically'),
         'severity' => SystemManager::REQUIREMENT_WARNING,
@@ -42,29 +42,13 @@ function automatic_updates_requirements($phase) {
   }
 }
 
-/**
- * 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,12 +8,12 @@
 declare(strict_types = 1);
 
 use Drupal\automatic_updates\BatchProcessor;
-use Drupal\automatic_updates\CronUpdater;
+use Drupal\automatic_updates\CronUpdateStage;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\automatic_updates\Validation\AdminStatusCheckMessages;
 use Drupal\Core\Url;
+use Drupal\package_manager\ComposerInspector;
 use Drupal\system\Controller\DbUpdateController;
-use Drupal\package_manager\Validator\ComposerExecutableValidator;
 
 /**
  * Implements hook_help().
@@ -31,7 +31,7 @@ function automatic_updates_help($route_name, RouteMatchInterface $route_match) {
       $output .= '</p>';
       $output .= '<p>' . t('Additionally, Automatic Updates periodically runs checks to ensure that updates can be installed, and will warn site administrators if problems are detected.') . '</p>';
       $output .= '<h3>' . t('Requirements') . '</h3>';
-      $output .= '<p>' . t('Automatic Updates requires a Composer executable whose version satisfies <code>@version</code>, and PHP must have permission to run it. The path to the executable may be set in the <code>package_manager.settings:executables.composer</code> config setting, or it will be automatically detected.', ['@version' => ComposerExecutableValidator::MINIMUM_COMPOSER_VERSION_CONSTRAINT]) . '</p>';
+      $output .= '<p>' . 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>';
@@ -127,10 +127,7 @@ function automatic_updates_page_top() {
 
   // @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',
@@ -166,15 +163,15 @@ function automatic_updates_module_implements_alter(&$implementations, $hook) {
  * Implements hook_cron().
  */
 function automatic_updates_cron() {
-  // @todo Refactor this after https://www.drupal.org/project/drupal/issues/2969056
+  // @todo Refactor this after https://www.drupal.org/project/drupal/issues/2538292
   // @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\CronUpdateStage $stage */
+  $stage = \Drupal::service('automatic_updates.cron_update_stage');
+  $stage->handleCron();
 
   /** @var \Drupal\automatic_updates\Validation\StatusChecker $status_checker */
   $status_checker = \Drupal::service('automatic_updates.status_checker');
@@ -187,7 +184,7 @@ function automatic_updates_cron() {
   }
 
   // Only try to send failure notifications if unattended updates are enabled.
-  if ($updater->getMode() !== CronUpdater::DISABLED) {
+  if ($stage->getMode() !== CronUpdateStage::DISABLED) {
     \Drupal::service('automatic_updates.status_check_mailer')
       ->sendFailureNotifications($last_results, $status_checker->getResults());
   }
@@ -202,12 +199,12 @@ function automatic_updates_modules_installed($modules) {
   /** @var \Drupal\automatic_updates\Validation\StatusChecker $status_checker */
   $status_checker = \Drupal::service('automatic_updates.status_checker');
   $status_checker->run();
-  /** @var \Drupal\automatic_updates\CronUpdater $cron_updater */
-  $cron_updater = \Drupal::service('automatic_updates.cron_updater');
+  /** @var \Drupal\automatic_updates\CronUpdateStage $stage */
+  $stage = \Drupal::service('automatic_updates.cron_update_stage');
   // 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 ($stage->getMode() === CronUpdateStage::DISABLED) {
     /** @var \Drupal\automatic_updates\Validation\AdminStatusCheckMessages $status_check_messages */
     $status_check_messages = \Drupal::classResolver(AdminStatusCheckMessages::class);
     $status_check_messages->displayResultSummary();
@@ -246,15 +243,15 @@ function automatic_updates_preprocess_update_project_status(array &$variables) {
   if ($project['name'] !== 'drupal') {
     return;
   }
-  $updater = \Drupal::service('automatic_updates.updater');
+  $stage = \Drupal::service('automatic_updates.update_stage');
   $supported_target_versions = [];
   /** @var \Drupal\automatic_updates\ReleaseChooser $recommender */
   $recommender = \Drupal::service('automatic_updates.release_chooser');
   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();
     }
   }

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

@@ -30,39 +30,6 @@ automatic_updates.finish:
 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'
+    _controller: 'automatic_updates.cron_update_stage:handlePostApply'
   requirements:
     _access_system_cron: 'TRUE'
-
-# These routes are deprecated and will be removed in the next major version of
-# Automatic Updates. They redirect to existing routes from the core Update
-# module, which are overridden by Automatic Updates.
-# @see \Drupal\automatic_updates\Routing\RouteSubscriber::alterRoutes()
-automatic_updates.report_update:
-  path: '/admin/reports/updates/automatic-update'
-  defaults:
-    _controller: '\Drupal\automatic_updates\Controller\UpdateController::redirectDeprecatedRoute'
-  requirements:
-    _access: 'TRUE'
-automatic_updates.module_update:
-  path: '/admin/modules/automatic-update'
-  defaults:
-    _controller: '\Drupal\automatic_updates\Controller\UpdateController::redirectDeprecatedRoute'
-  requirements:
-    _access: 'TRUE'
-automatic_updates.theme_update:
-  path: '/admin/theme/automatic-update'
-  defaults:
-    _controller: '\Drupal\automatic_updates\Controller\UpdateController::redirectDeprecatedRoute'
-  requirements:
-    _access: 'TRUE'
-automatic_updates.update_readiness:
-  path: '/admin/automatic_updates/readiness'
-  defaults:
-    _controller: '\Drupal\automatic_updates\Controller\StatusCheckController::runReadiness'
-    _title: 'Update readiness checking'
-  requirements:
-    _permission: 'administer software updates'
-  options:
-    _maintenance_access: TRUE
-    _automatic_updates_status_messages: skip

automatic_updates.services.yml

 services:
+  _defaults:
+    autowire: true
+
   automatic_updates.route_subscriber:
     class: Drupal\automatic_updates\Routing\RouteSubscriber
     tags:
@@ -6,121 +9,61 @@ services:
   automatic_updates.status_checker:
     class: 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 }
+  Drupal\automatic_updates\Validation\StatusChecker: '@automatic_updates.status_checker'
   automatic_updates.status_check_mailer:
     class: Drupal\automatic_updates\StatusCheckMailer
-    arguments:
-      - '@config.factory'
-      - '@plugin.manager.mail'
-      - '@language_manager'
-  automatic_updates.readiness_validation_manager:
-    class: Drupal\automatic_updates\Validation\ReadinessValidationManager
-    arguments:
-      - '@automatic_updates.status_checker'
-    deprecated: The "%service_id%" service is deprecated in automatic_updates:8.x-2.5 and is removed from automatic_updates:3.0.0. Use the automatic_updates.status_checker service instead. See https://www.drupal.org/node/3316086.
-  automatic_updates.updater:
-    class: Drupal\automatic_updates\Updater
-    arguments:
-      - '@config.factory'
-      - '@package_manager.path_locator'
-      - '@package_manager.beginner'
-      - '@package_manager.stager'
-      - '@package_manager.committer'
-      - '@file_system'
-      - '@event_dispatcher'
-      - '@tempstore.shared'
-      - '@datetime.time'
-      - '@PhpTuf\ComposerStager\Infrastructure\Factory\Path\PathFactoryInterface'
-      - '@package_manager.failure_marker'
+  Drupal\automatic_updates\StatusCheckMailer: '@automatic_updates.status_check_mailer'
+  automatic_updates.update_stage:
+    class: Drupal\automatic_updates\UpdateStage
     calls:
       - ['setLogger', ['@logger.channel.automatic_updates']]
-  automatic_updates.cron_updater:
-    class: Drupal\automatic_updates\CronUpdater
-    arguments:
-      - '@automatic_updates.release_chooser'
-      - '@logger.factory'
-      - '@plugin.manager.mail'
-      - '@automatic_updates.status_check_mailer'
-      - '@state'
-      - '@config.factory'
-      - '@package_manager.path_locator'
-      - '@package_manager.beginner'
-      - '@package_manager.stager'
-      - '@package_manager.committer'
-      - '@file_system'
-      - '@event_dispatcher'
-      - '@tempstore.shared'
-      - '@datetime.time'
-      - '@PhpTuf\ComposerStager\Infrastructure\Factory\Path\PathFactoryInterface'
-      - '@package_manager.failure_marker'
+  Drupal\automatic_updates\UpdateStage: '@automatic_updates.update_stage'
+  automatic_updates.cron_update_stage:
+    class: Drupal\automatic_updates\CronUpdateStage
     calls:
       - ['setLogger', ['@logger.channel.automatic_updates']]
+  Drupal\automatic_updates\CronUpdateStage: '@automatic_updates.cron_update_stage'
   automatic_updates.requested_update_validator:
     class: Drupal\automatic_updates\Validator\RequestedUpdateValidator
-    arguments:
-      - '@string_translation'
     tags:
       - { name: event_subscriber }
   automatic_updates.staged_projects_validator:
     class: Drupal\automatic_updates\Validator\StagedProjectsValidator
-    arguments:
-      - '@string_translation'
     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
     arguments:
-      - '@config.factory'
-      - '@module_handler'
-      - '@state'
-      - '@datetime.time'
-      - '@string_translation'
-      - '@automatic_updates.cron_updater'
-      - '@lock'
+      $lock: '@lock'
     tags:
       - { name: event_subscriber }
   automatic_updates.validator.staged_database_updates:
     class: Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator
-    arguments:
-      - '@package_manager.validator.staged_database_updates'
-      - '@string_translation'
     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
-    arguments:
-      - '@automatic_updates.status_checker'
     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
-    arguments:
-      - '@package_manager.path_locator'
     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
-    arguments:
-      - '@request_stack'
-      - '@config.factory'
-      - '@module_handler'
     tags:
       - { name: event_subscriber }
   logger.channel.automatic_updates:

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 || ^10
+core_version_requirement: ^9.7 || ^10
 lifecycle: experimental
 dependencies:
   - drupal:automatic_updates

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'
-      - '@PhpTuf\ComposerStager\Infrastructure\Factory\Path\PathFactoryInterface'
-      - '@package_manager.failure_marker'
+  _defaults:
+    autowire: true
+
+  automatic_updates_extensions.update_stage:
+    class: Drupal\automatic_updates_extensions\ExtensionUpdateStage
+  Drupal\automatic_updates_extensions\ExtensionUpdateStage: '@automatic_updates_extensions.update_stage'
   automatic_updates_extensions.validator.target_release:
     class: Drupal\automatic_updates_extensions\Validator\UpdateReleaseValidator
     tags:

automatic_updates_extensions/src/BatchProcessor.php

@@ -5,7 +5,6 @@ declare(strict_types = 1);
 namespace Drupal\automatic_updates_extensions;
 
 use Drupal\Core\Url;
-use Drupal\package_manager\Exception\StageValidationException;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
@@ -25,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');
+  protected static function getStage(): ExtensionUpdateStage {
+    return \Drupal::service('automatic_updates_extensions.update_stage');
   }
 
   /**
@@ -47,39 +46,23 @@ final class BatchProcessor {
    *   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;
-    }
+    $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) {
@@ -88,17 +71,17 @@ 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);
@@ -107,18 +90,18 @@ final class BatchProcessor {
   }
 
   /**
-   * 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
@@ -135,18 +118,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);
@@ -154,18 +137,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);

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

@@ -4,20 +4,15 @@ declare(strict_types = 1);
 
 namespace Drupal\automatic_updates_extensions;
 
-use Drupal\automatic_updates\Exception\UpdateException;
 use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TempStore\SharedTempStoreFactory;
-use Drupal\package_manager\Exception\ApplyFailedException;
+use Drupal\package_manager\ComposerInspector;
 use Drupal\package_manager\FailureMarker;
 use Drupal\package_manager\LegacyVersionUtility;
-use Drupal\package_manager\Event\StageEvent;
-use Drupal\package_manager\Exception\StageValidationException;
 use Drupal\package_manager\PathLocator;
-use Drupal\package_manager\Stage;
-use Drupal\package_manager\UnusedConfigFactory;
+use Drupal\package_manager\StageBase;
 use PhpTuf\ComposerStager\Domain\Core\Beginner\BeginnerInterface;
 use PhpTuf\ComposerStager\Domain\Core\Committer\CommitterInterface;
 use PhpTuf\ComposerStager\Domain\Core\Stager\StagerInterface;
@@ -31,15 +26,48 @@ 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 {
+class ExtensionUpdateStage extends StageBase {
 
   /**
-   * {@inheritdoc}
+   * Constructs a new ExtensionUpdateStage object.
    *
-   * @todo Remove this in https://www.drupal.org/i/3303167
+   * @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
+   *   The beginner service.
+   * @param \PhpTuf\ComposerStager\Domain\Core\Stager\StagerInterface $stager
+   *   The stager service.
+   * @param \PhpTuf\ComposerStager\Domain\Core\Committer\CommitterInterface $committer
+   *   The committer service.
+   * @param \Drupal\Core\File\FileSystemInterface $fileSystem
+   *   The file system service.
+   * @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
+   *   The path factory service.
+   * @param \Drupal\package_manager\FailureMarker $failureMarker
+   *   The failure marker service.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, PathLocator $path_locator, BeginnerInterface $beginner, StagerInterface $stager, CommitterInterface $committer, FileSystemInterface $file_system, EventDispatcherInterface $event_dispatcher, SharedTempStoreFactory $temp_store_factory, TimeInterface $time, PathFactoryInterface $path_factory = NULL, FailureMarker $failure_marker = NULL) {
-    parent::__construct(new UnusedConfigFactory(), $path_locator, $beginner, $stager, $committer, $file_system, $event_dispatcher, $temp_store_factory, $time, $path_factory, $failure_marker);
+  public function __construct(
+    protected readonly ComposerInspector $composerInspector,
+    PathLocator $pathLocator,
+    BeginnerInterface $beginner,
+    StagerInterface $stager,
+    CommitterInterface $committer,
+    FileSystemInterface $fileSystem,
+    EventDispatcherInterface $eventDispatcher,
+    SharedTempStoreFactory $tempStoreFactory,
+    TimeInterface $time,
+    PathFactoryInterface $pathFactory,
+    FailureMarker $failureMarker,
+  ) {
+    parent::__construct($pathLocator, $beginner, $stager, $committer, $fileSystem, $eventDispatcher, $tempStoreFactory, $time, $pathFactory, $failureMarker);
   }
 
   /**
@@ -58,29 +86,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();
-    $installed_packages = $composer->getInstalledPackages();
+    $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 = $composer->getPackageForProject($project_name);
+      $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 ($installed_packages[$package]->getType() === 'drupal-profile') {
+      if ($package->type === 'drupal-profile') {
         throw new \InvalidArgumentException("The project $project_name cannot be updated because updating install profiles is not supported.");
       }
 
-      $group = array_key_exists($package, $require_dev) ? 'dev' : 'production';
-      $package_versions[$group][$package] = LegacyVersionUtility::convertToSemanticVersion($version);
+      $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
@@ -123,30 +149,6 @@ class ExtensionUpdater extends Stage {
     $this->require($versions['production'], $versions['dev']);
   }
 
-  /**
-   * {@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(), $e->getCode(), $e);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function apply(?int $timeout = 600): void {
-    try {
-      parent::apply($timeout);
-    }
-    catch (ApplyFailedException $exception) {
-      throw new UpdateException([], 'The update operation failed to apply. The update may have been partially applied. It is recommended that the site be restored from a code backup.', $exception->getCode(), $exception);
-    }
-  }
-
   /**
    * {@inheritdoc}
    */

automatic_updates_extensions/src/Form/UpdateReady.php

@@ -5,12 +5,14 @@ declare(strict_types = 1);
 namespace Drupal\automatic_updates_extensions\Form;
 
 use Drupal\automatic_updates\Form\UpdateFormBase;
-use Drupal\package_manager\Exception\ApplyFailedException;
+use Drupal\package_manager\ComposerInspector;
+use Drupal\package_manager\Exception\StageFailureMarkerException;
+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;
@@ -32,64 +34,37 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  */
 final class UpdateReady extends UpdateFormBase {
 
-  /**
-   * 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 renderer service.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $eventDispatcher;
-
   /**
    * 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\Core\Render\RendererInterface $renderer
    *   The renderer service.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
+   * @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, RendererInterface $renderer, EventDispatcherInterface $event_dispatcher) {
-    $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->renderer = $renderer;
-    $this->eventDispatcher = $event_dispatcher;
   }
 
   /**
@@ -104,12 +79,14 @@ final class UpdateReady extends UpdateFormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('automatic_updates_extensions.updater'),
+      $container->get('automatic_updates_extensions.update_stage'),
       $container->get('messenger'),
       $container->get('state'),
       $container->get('extension.list.module'),
       $container->get('renderer'),
-      $container->get('event_dispatcher')
+      $container->get('event_dispatcher'),
+      $container->get('package_manager.composer_inspector'),
+      $container->get('package_manager.path_locator')
     );
   }
 
@@ -118,13 +95,13 @@ 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 $e) {
+    catch (StageOwnershipException) {
       $this->messenger()->addError($this->t('Cannot continue the update because another Composer operation is currently in progress.'));
       return $form;
     }
-    catch (ApplyFailedException $e) {
+    catch (StageFailureMarkerException $e) {
       $this->messenger()->addError($e->getMessage());
       return $form;
     }
@@ -167,7 +144,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
@@ -214,7 +191,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');
     }
@@ -231,17 +208,16 @@ final class UpdateReady extends UpdateFormBase {
    */
   private function showUpdates(): array {
     // Get packages that were updated in the stage directory.
-    $active = $this->updater->getActiveComposer();
-    $staged = $this->updater->getStageComposer();
-    $updated_packages = $staged->getPackagesWithDifferentVersionsIn($active);
+    $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->updater->getPackageVersions() as $group) {
+    foreach ($this->stage->getPackageVersions() as $group) {
       $updated_by_request = array_merge($updated_by_request, array_keys($group));
     }
 
-    $installed_packages = $active->getInstalledPackages();
     $updated_by_request_info = [];
     $updated_project_info = [];
     $supported_package_types = ['drupal-module', 'drupal-theme'];
@@ -250,17 +226,17 @@ final class UpdateReady extends UpdateFormBase {
     // updated.
     foreach ($updated_packages as $name => $updated_package) {
       // Ignore anything that isn't a module or a theme.
-      if (!in_array($updated_package->getType(), $supported_package_types, TRUE)) {
+      if (!in_array($updated_package->type, $supported_package_types, TRUE)) {
         continue;
       }
       $updated_project_info[$name] = [
-        'title' => $this->getProjectTitle($updated_package->getName()),
-        'installed_version' => $installed_packages[$name]->getPrettyVersion(),
-        'updated_version' => $updated_package->getPrettyVersion(),
+        'title' => $this->getProjectTitle($updated_package->name),
+        'installed_version' => $installed_packages[$updated_package->name]->version,
+        'updated_version' => $updated_package->version,
       ];
     }
 
-    foreach (array_keys($updated_packages) as $name) {
+    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).

automatic_updates_extensions/src/Form/UpdaterForm.php

@@ -6,15 +6,17 @@ 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;
 use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Url;
-use Drupal\package_manager\Exception\ApplyFailedException;
+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;
@@ -30,75 +32,48 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  */
 final class UpdaterForm extends UpdateFormBase {
 
-  /**
-   * 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;
-
-  /**
-   * Failure marker service.
-   *
-   * @var \Drupal\package_manager\FailureMarker
-   */
-  private $failureMarker;
-
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('automatic_updates_extensions.updater'),
+      $container->get('automatic_updates_extensions.update_stage'),
       $container->get('event_dispatcher'),
       $container->get('renderer'),
       $container->get('state'),
-      $container->get('package_manager.failure_marker')
+      $container->get('package_manager.failure_marker'),
+      $container->get('package_manager.composer_inspector'),
+      $container->get('package_manager.path_locator')
     );
   }
 
   /**
    * 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 $failure_marker
+   * @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, FailureMarker $failure_marker) {
-    $this->extensionUpdater = $extension_updater;
-    $this->eventDispatcher = $event_dispatcher;
-    $this->renderer = $renderer;
-    $this->state = $state;
-    $this->failureMarker = $failure_marker;
-  }
+  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}
@@ -114,7 +89,7 @@ final class UpdaterForm extends UpdateFormBase {
     try {
       $this->failureMarker->assertNotExists();
     }
-    catch (ApplyFailedException $e) {
+    catch (StageFailureMarkerException $e) {
       $this->messenger()->addError($e->getMessage());
       return $form;
     }
@@ -164,7 +139,7 @@ final class UpdaterForm extends UpdateFormBase {
       $results = [];
     }
     else {
-      $results = $this->runStatusCheck($this->extensionUpdater, $this->eventDispatcher, TRUE);
+      $results = $this->runStatusCheck($this->stage, $this->eventDispatcher);
     }
     $this->displayResults($results, $this->renderer);
     $security_level = ValidationResult::getOverallSeverity($results);
@@ -191,7 +166,7 @@ final class UpdaterForm extends UpdateFormBase {
    */
   protected 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.
@@ -217,7 +192,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"));
   }
 
@@ -261,12 +236,13 @@ final class UpdaterForm extends UpdateFormBase {
 
     $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())
+      ->getArrayCopy();
     $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 (!in_array("drupal/$project_name", $installed_packages, TRUE)) {
+          if (!array_key_exists("drupal/$project_name", $installed_packages)) {
             $non_supported_update_statuses[] = $project_data['status'];
             continue;
           }

automatic_updates_extensions/src/Validator/UpdateReleaseValidator.php

@@ -4,8 +4,10 @@ declare(strict_types = 1);
 
 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\automatic_updates_extensions\ExtensionUpdateStage;
 use Drupal\package_manager\LegacyVersionUtility;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\package_manager\Event\PreCreateEvent;
@@ -18,12 +20,26 @@ 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 {
 
   use StringTranslationTrait;
 
+  /**
+   * Constructs an UpdateReleaseValidator 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
+  ) {}
+
   /**
    * Checks if the given version of a project is supported.
    *
@@ -71,17 +87,18 @@ final class UpdateReleaseValidator implements EventSubscriberInterface {
    *   The event object.
    */
   public function checkRelease(PreCreateEvent $event): void {
-    $stage = $event->getStage();
+    $stage = $event->stage;
     // This check only works with Automatic Updates Extensions.
-    if (!$stage instanceof ExtensionUpdater) {
+    if (!$stage instanceof ExtensionUpdateStage) {
       return;
     }
 
+    $active_packages = $this->composerInspector->getInstalledPackagesList($this->pathLocator->getProjectRoot());
     $all_versions = $stage->getPackageVersions();
     $messages = [];
     foreach (['production', 'dev'] as $package_type) {
       foreach ($all_versions[$package_type] as $package_name => $sematic_version) {
-        $project_name = $stage->getActiveComposer()->getProjectForPackage($package_name);
+        $project_name = $active_packages[$package_name]->getProjectName();
         // If the version isn't in the list of installable releases, then it
         // isn't secure and supported and the user should receive an error.
         if (!$this->isSupportedRelease($project_name, $sematic_version)) {

automatic_updates_extensions/tests/fixtures/fake-site/composer.json

-{
-    "require": {
-        "drupal/core-recommended": "^9",
-        "drupal/my_module": "^9",
-        "drupal/contrib_profile1": "*"
-    },
-    "require-dev": {
-        "drupal/my_dev_module": "^9"
-    }
-}

automatic_updates_extensions/tests/fixtures/fake-site/composer.lock

-{
-    "packages": [
-        {
-            "name": "drupal/core-recommended",
-            "version": "9.8.0",
-            "require": {
-                "drupal/core": "9.8.0"
-            }
-        },
-        {
-            "name": "drupal/my_module",
-            "version": "9.8.0",
-            "type": "drupal-module"
-        },
-        {
-            "name": "drupal/contrib_profile1",
-            "version": "1.0.0",
-            "type": "drupal-profile"
-        },
-        {
-            "name": "drupal/semver_test",
-            "version": "1.0.0",
-            "type": "drupal-module"
-        },
-        {
-            "name": "drupal/aaa_update_test",
-            "version": "1.0.0",
-            "type": "drupal-module"
-        },
-        {
-            "name": "drupal/aaa_automatic_updates_test",
-            "version": "1.0.0",
-            "type": "drupal-module"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "drupal/my_dev_module",
-            "version": "9.8.1",
-            "type": "drupal-module"
-        }
-    ]
-}

automatic_updates_extensions/tests/fixtures/fake-site/vendor/composer/installed.json

-{
-    "packages": [
-        {
-            "name": "drupal/core-recommended",
-            "version": "9.8.0",
-            "require": {
-                "drupal/core": "9.8.0"
-            }
-        },
-        {
-            "name": "drupal/core",
-            "version": "9.8.0",
-            "extra": {
-                "drupal-scaffold": {
-                    "file-mapping": {}
-                }
-            }
-        },
-        {
-            "name": "drupal/my_module",
-            "version": "9.8.0",
-            "type": "drupal-module"
-        },
-        {
-            "name": "drupal/contrib_profile1",
-            "version": "1.0.0",
-            "type": "drupal-profile"
-        },
-        {
-            "name": "drupal/my_dev_module",
-            "version": "9.8.1",
-            "type": "drupal-module"
-        },
-        {
-            "name": "drupal/semver_test",
-            "version": "1.0.0",
-            "type": "drupal-module"
-        },
-        {
-            "name": "drupal/aaa_update_test",
-            "version": "1.0.0",
-            "type": "drupal-module"
-        },
-        {
-            "name": "drupal/aaa_automatic_updates_test",
-            "version": "1.0.0",
-            "type": "drupal-module"
-        }
-    ],
-    "dev": true,
-    "dev-package-names": [
-        "drupal/my_dev_module"
-    ]
-}

automatic_updates_extensions/tests/fixtures/fake-site/vendor/composer/installed.php

-<?php
-
-/**
- * @file
- */
-
-$projects_dir = __DIR__ . '/../../web/projects';
-return [
-  'versions' => [
-    'drupal/my_module' => [
-      'type' => 'drupal-module',
-      'install_path' => $projects_dir . '/my_module',
-    ],
-    'drupal/contrib_profile1' => [
-      'type' => 'drupal-profile',
-      'install_path' => __DIR__ . '/../../web/profiles/contrib_profile1',
-    ],
-    'drupal/my_dev_module' => [
-      'type' => 'drupal-module',
-      'install_path' => $projects_dir . '/my_dev_module',
-    ],
-    'drupal/semver_test' => [
-      'type' => 'drupal-module',
-      'install_path' => $projects_dir . '/semver_test',
-    ],
-    'drupal/aaa_update_test' => [
-      'type' => 'drupal-module',
-      'install_path' => $projects_dir . '/aaa_update_test',
-    ],
-    'drupal/aaa_automatic_updates_test' => [
-      'type' => 'drupal-module',
-      'install_path' => $projects_dir . '/aaa_automatic_updates_test',
-    ],
-  ],
-];

automatic_updates_extensions/tests/fixtures/fake-site/web/profiles/contrib_profile1/contrib_profile1.info.yml.hide

-project: contrib_profile1
-type: profile