README.md

 Automatic Updates
 ---------------
+🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥
+
+Warning the 8.x-2.x version of this module is still in development and should only be used development and testing.
+
+🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥
 
 ### Automatic Updates Initiative
 
 - Follow and read up on
   [Ideas queue - Automatic Updates initiative](https://www.drupal.org/project/ideas/issues/2940731)
+
+
+### Manual Testing instructions:
+
+1. Create a Drupal project via: `composer create-project drupal/recommended-project:9.2.5 test_updates_project`. Change `9.2.5` to the patch release before the most current version of Drupal. For instance, if the latest version of Drupal core is `9.2.8` then use `9.2.7`
+2. `cd test_updates_project`
+3. `composer require drupal/automatic_updates:2.x-dev`
+4. `cd web`
+5. Install Drupal: `php ./core/scripts/drupal quick-start standard`
+6. You should see a browser open and log you into the new Drupal site.
+7. Click "Extend" in the sidebar.
+8. Enable the "Automatic Updates" module.
+9. Click the "Updates" tab.
+10. You should see an update form with the next of Drupal core as the "Recommend Version". For instance if in step #1 you ran `composer create-project drupal/recommended-project:9.2.5 test_updates_project` and the latest version is `9.2.6` you will see `9.2.6` as the "Recommend Version".
+11. Click the "Download these updates" button.
+12. You should see a "Downloading updates" screen.
+13. Next you should see a "Ready to update" page.
+14. Click the "Continue" button at the bottom.
+15. You should see a "Apply updates" screen.
+16. You should be redirected to the "Available updates" page and see the message "Update Complete".
+17. You should see your version of core is up-to-date.
+18. 🎉

automatic_updates.info.yml

@@ -3,5 +3,6 @@ type: module
 description: 'Experimental module to develop automatic updates. Currently the module provides checks for update readiness but does not yet provide update functionality.'
 core_version_requirement: ^9
 dependencies:
+  - drupal:package_manager
   - drupal:automatic_updates_9_3_shim
   - drupal:update

automatic_updates.install

@@ -11,11 +11,17 @@ use Drupal\automatic_updates\Validation\ReadinessRequirements;
  * Implements hook_requirements().
  */
 function automatic_updates_requirements($phase) {
-  if ($phase !== 'runtime') {
-    return [];
+  if ($phase === 'runtime') {
+    /** @var \Drupal\automatic_updates\Validation\ReadinessRequirements $readiness_requirement */
+    $readiness_requirement = \Drupal::classResolver(ReadinessRequirements::class);
+    return $readiness_requirement->getRequirements();
+  }
+  if ($phase === 'install' && !class_exists('PhpTuf\ComposerStager\Domain\Beginner')) {
+    return [
+      'automatic_updates' => [
+        'description' => t('External dependencies for Automatic Updates are not available. Composer must be used to download the module with dependencies.'),
+        'severity' => REQUIREMENT_ERROR,
+      ],
+    ];
   }
-
-  /** @var \Drupal\automatic_updates\Validation\ReadinessRequirements $readiness_requirement */
-  $readiness_requirement = \Drupal::classResolver(ReadinessRequirements::class);
-  return $readiness_requirement->getRequirements();
 }

automatic_updates.module

@@ -5,6 +5,7 @@
  * Contains hook implementations for Automatic Updates.
  */
 
+use Drupal\automatic_updates\CronUpdater;
 use Drupal\automatic_updates\Validation\AdminReadinessMessages;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
@@ -22,6 +23,10 @@ function automatic_updates_page_top() {
  * Implements hook_cron().
  */
 function automatic_updates_cron() {
+  /** @var \Drupal\automatic_updates\CronUpdater $cron_updater */
+  $cron_updater = \Drupal::classResolver(CronUpdater::class);
+  $cron_updater->handleCron();
+
   /** @var \Drupal\automatic_updates\Validation\ReadinessValidationManager $checker_manager */
   $checker_manager = \Drupal::service('automatic_updates.readiness_validation_manager');
   $last_results = $checker_manager->getResults();
@@ -63,10 +68,38 @@ function automatic_updates_form_update_manager_update_form_alter(&$form, FormSta
   // Remove current message that core updates are not supported with a link to
   // use this modules form.
   if (isset($form['manual_updates']['#rows']['drupal']['data']['title'])) {
-    $core_updates_message = t(
-      '<h2>Core updates required</h2>Drupal core updates are supported by the enabled <a href="@url">Automatic Updates module</a>',
-      ['@url' => Url::fromRoute('automatic_updates.update_form')->toString()]
-    );
-    $form['manual_updates']['#prefix'] = $core_updates_message;
+    $current_route = \Drupal::routeMatch()->getRouteName();
+    if ($current_route === 'update.module_update') {
+      $redirect_route = 'automatic_updates.module_update';
+    }
+    elseif ($current_route === 'update.report_update') {
+      $redirect_route = 'automatic_updates.report_update';
+    }
+    if (!empty($redirect_route)) {
+      $core_updates_message = t(
+        '<h2>Core updates required</h2>Drupal core updates are supported by the enabled <a href="@url">Automatic Updates module</a>',
+        ['@url' => Url::fromRoute($redirect_route)->toString()]
+      );
+      $form['manual_updates']['#prefix'] = $core_updates_message;
+    }
+  }
+}
+
+/**
+ * Implements hook_local_tasks_alter().
+ */
+function automatic_updates_local_tasks_alter(array &$local_tasks) {
+  // The Update module's update form only allows updating modules and themes
+  // via archive files, which could produce unexpected results on a site using
+  // our Composer-based updater.
+  $new_routes = [
+    'update.report_update' => 'automatic_updates.report_update',
+    'update.module_update' => 'automatic_updates.module_update',
+    'update.theme_update' => 'automatic_updates.theme_update',
+  ];
+  foreach ($new_routes as $local_task_id => $new_route) {
+    if (!empty($local_tasks[$local_task_id])) {
+      $local_tasks[$local_task_id]['route_name'] = $new_route;
+    }
   }
 }

automatic_updates.routing.yml

@@ -5,20 +5,40 @@ automatic_updates.update_readiness:
     _title: 'Update readiness checking'
   requirements:
     _permission: 'administer software updates'
-automatic_updates.update_form:
-  path: '/admin/automatic-update'
+automatic_updates.confirmation_page:
+  path: '/admin/automatic-update-ready'
+  defaults:
+    _form: '\Drupal\automatic_updates\Form\UpdateReady'
+    _title: 'Ready to update'
+  requirements:
+    _permission: 'administer software updates'
+    _access_update_manager: 'TRUE'
+# Links to our updater form appear in two different sets of local tasks. To ensure the breadcrumbs and paths are
+# consistent with the other local tasks in each set, we need two separate routes to the same form.
+automatic_updates.report_update:
+  path: '/admin/reports/updates/automatic-update'
   defaults:
     _form: '\Drupal\automatic_updates\Form\UpdaterForm'
-    _title: 'Automatic Updates'
+    _title: 'Update'
   requirements:
     _permission: 'administer software updates'
   options:
     _admin_route: TRUE
-automatic_updates.confirmation_page:
-  path: '/admin/automatic-update-ready'
+automatic_updates.module_update:
+  path: '/admin/modules/automatic-update'
   defaults:
-    _form: '\Drupal\automatic_updates\Form\UpdateReady'
-    _title: 'Ready to update'
+    _form: '\Drupal\automatic_updates\Form\UpdaterForm'
+    _title: 'Update'
   requirements:
     _permission: 'administer software updates'
-    _access_update_manager: 'TRUE'
+  options:
+    _admin_route: TRUE
+automatic_updates.theme_update:
+  path: '/admin/theme/automatic-update'
+  defaults:
+    _form: '\Drupal\automatic_updates\Form\UpdaterForm'
+    _title: 'Update'
+  requirements:
+    _permission: 'administer software updates'
+  options:
+    _admin_route: TRUE

automatic_updates.services.yml

 services:
   automatic_updates.readiness_validation_manager:
     class: Drupal\automatic_updates\Validation\ReadinessValidationManager
-    arguments: ['@keyvalue.expirable', '@datetime.time', 24]
+    arguments: ['@keyvalue.expirable', '@datetime.time', '@automatic_updates.updater', '@event_dispatcher', 24]
   automatic_updates.updater:
     class: Drupal\automatic_updates\Updater
-    arguments: ['@state', '@string_translation','@automatic_updates.beginner', '@automatic_updates.stager', '@automatic_updates.cleaner', '@automatic_updates.committer', '@event_dispatcher', '@automatic_updates.path_locator']
-  automatic_updates.beginner:
-    class: PhpTuf\ComposerStager\Domain\Beginner
-    arguments:
-      ['@automatic_updates.file_copier', '@automatic_updates.file_system' ]
-  automatic_updates.stager:
-    class: PhpTuf\ComposerStager\Domain\Stager
-    arguments:
-      ['@automatic_updates.composer_runner', '@automatic_updates.file_system' ]
+    arguments: ['@state', '@string_translation','@package_manager.beginner', '@package_manager.stager', '@package_manager.cleaner', '@package_manager.committer', '@event_dispatcher', '@automatic_updates.path_locator']
   automatic_updates.cleaner:
     class: Drupal\automatic_updates\ComposerStager\Cleaner
+    decorates: package_manager.cleaner
+    public: false
     arguments:
-      - '@automatic_updates.file_system'
+      - '@automatic_updates.cleaner.inner'
       - '%site.path%'
       - '@automatic_updates.path_locator'
-  automatic_updates.committer:
-    class: PhpTuf\ComposerStager\Domain\Committer
-    arguments:
-      ['@automatic_updates.file_copier', '@automatic_updates.file_system' ]
-  automatic_updates.composer_runner:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\Runner\ComposerRunner
-    arguments:
-      ['@automatic_updates.exec_finder', '@automatic_updates.process_factory' ]
-  automatic_updates.file_copier.factory:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierFactory
-    arguments:
-      - '@automatic_updates.symfony_exec_finder'
-      - '@automatic_updates.file_copier.php'
-      - '@automatic_updates.file_copier.rsync'
-  automatic_updates.file_copier.rsync:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopier
-    arguments:
-      - '@automatic_updates.file_system'
-      - '@automatic_updates.rsync'
-  automatic_updates.file_copier.php:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopier
-    arguments:
-      - '@automatic_updates.file_system'
-      - '@automatic_updates.finder'
-      - '@automatic_updates.finder'
-  automatic_updates.finder:
-    class: Symfony\Component\Finder\Finder
-    public: false
-  automatic_updates.file_copier:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierInterface
-    factory: ['@automatic_updates.file_copier.factory', 'create']
-  automatic_updates.file_system:
-    class: PhpTuf\ComposerStager\Infrastructure\Filesystem\Filesystem
+    properties: { _serviceId: package_manager.cleaner }
+  automatic_updates.update_refresh_subscriber:
+    class: Drupal\automatic_updates\Event\UpdateRefreshSubscriber
     arguments:
-      ['@automatic_updates.symfony_file_system' ]
-  automatic_updates.symfony_file_system:
-    class: Symfony\Component\Filesystem\Filesystem
-  automatic_updates.symfony_exec_finder:
-    class: Symfony\Component\Process\ExecutableFinder
-  automatic_updates.rsync:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\Runner\RsyncRunner
-    arguments:
-      ['@automatic_updates.exec_finder', '@automatic_updates.process_factory' ]
-  automatic_updates.exec_finder:
-    class: PhpTuf\ComposerStager\Infrastructure\Process\ExecutableFinder
-    arguments:
-      ['@automatic_updates.symfony_exec_finder' ]
-  automatic_updates.process_factory:
-    class: Drupal\automatic_updates\ComposerStager\ProcessFactory
+      - '@update.manager'
+    tags:
+      - { name: event_subscriber }
   automatic_updates.excluded_paths_subscriber:
     class: Drupal\automatic_updates\Event\ExcludedPathsSubscriber
     arguments: ['%app.root%', '%site.path%', '@file_system', '@stream_wrapper_manager']
@@ -85,7 +37,13 @@ services:
       - { name: event_subscriber }
   automatic_updates.composer_executable_validator:
     class: Drupal\automatic_updates\Validator\ComposerExecutableValidator
-    arguments: ['@automatic_updates.composer_runner']
+    arguments: ['@package_manager.composer_runner']
+    tags:
+      - { name: event_subscriber }
+  automatic_updates.disk_space_validator:
+    class: Drupal\automatic_updates\Validator\DiskSpaceValidator
+    arguments:
+      - '@automatic_updates.path_locator'
     tags:
       - { name: event_subscriber }
   automatic_updates.path_locator:

automatic_updates_9_3_shim/automatic_updates_9_3_shim.module

+<?php
+
+/**
+ * @file
+ * Contains hook implementations for Automatic Updates 9.3 shim module.
+ */
+
+/**
+ * Implements hook_page_top().
+ */
+function automatic_updates_9_3_shim_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',
+  ];
+  $route_name = \Drupal::routeMatch()->getRouteName();
+  if (!in_array($route_name, $skip_routes, TRUE) && function_exists('update_page_top')) {
+    update_page_top();
+  }
+}
+
+/**
+ * Implements hook_module_implements_alter().
+ *
+ * @todo Remove after https://www.drupal.org/i/3236497 is committed.
+ */
+function automatic_updates_9_3_shim_module_implements_alter(&$implementations, $hook) {
+  if ($hook === 'page_top') {
+    // Remove hook_page_top() implementation from the Update module. This '
+    // implementation displays error messages about security releases. We call
+    // this implementation in our own automatic_updates_page_top() except on our
+    // own routes to avoid stale messages about the security releases after an
+    // update.
+    unset($implementations['update']);
+  }
+
+}

composer.json

@@ -12,7 +12,7 @@
   },
   "require": {
     "ext-json": "*",
-    "php-tuf/composer-stager": "0.2.0"
+    "php-tuf/composer-stager": "0.2.1"
   },
   "config": {
     "platform": {

drupalci.yml

@@ -31,10 +31,17 @@ build:
           # Add our words to the dictionary
           - sed -i "s/abiword/updater's/" core/misc/cspell/dictionary.txt
           - sed -i "s/absolutezero/stager's/" core/misc/cspell/dictionary.txt
+          - sed -i "s/adamson/STACKLIMIT/" core/misc/cspell/dictionary.txt
           # After all of the shenanigans above, we're finally ready to run core's `commit-code-check.sh`! :)
           - "modules/contrib/automatic_updates/commit-code-check.sh --drupalci"
           # Restore the original permissions.
           - chmod 777 modules/contrib/automatic_updates/
+          # Disable the PCRE engine's JIT, since it causes Composer to die during the
+          # update process, but only on Drupal CI, and for reasons that are essentially
+          # impossible to trace into. The PCRE JIT is not necessary for Automatic Updates
+          # to work correctly, and disabling it is a known workaround.
+          # @see pcre.ini
+          - sudo cp modules/contrib/automatic_updates/pcre.ini /usr/local/etc/php/conf.d
         halt-on-fail: true
       # run_tests task is executed several times in order of performance speeds.
       # halt-on-fail can be set on the run_tests tasks in order to fail fast.

package_manager/config/schema/package_manager.schema.yml

+package_manager.settings:
+  type: config_object
+  label: 'Package Manager settings'
+  mapping:
+    file_copier:
+      type: string
+      label: 'Which file copier to use, or NULL to auto-detect'

package_manager/package_manager.info.yml

+name: 'Package Manager'
+type: module
+description: 'API module providing functionality for staging package updates.'
+core_version_requirement: ^9

package_manager/package_manager.install

+<?php
+
+/**
+ * @file
+ * Contains install and update functions for Package Manager.
+ */
+
+/**
+ * Implements hook_requirements().
+ */
+function package_manager_requirements($phase) {
+  if ($phase === 'install' && !class_exists('PhpTuf\ComposerStager\Domain\Beginner')) {
+    return [
+      'package_manager' => [
+        'description' => t('External dependencies for Package Manager are not available. Composer must be used to download the module with dependencies.'),
+        'severity' => REQUIREMENT_ERROR,
+      ],
+    ];
+  }
+}

package_manager/package_manager.services.yml

+services:
+  # Underlying Symfony utilities.
+  package_manager.symfony_file_system:
+    class: Symfony\Component\Filesystem\Filesystem
+  package_manager.symfony_executable_finder:
+    class: Symfony\Component\Process\ExecutableFinder
+  package_manager.symfony_finder:
+    class: Symfony\Component\Finder\Finder
+
+  # Basic infrastructure services.
+  package_manager.process_factory:
+    class: Drupal\package_manager\ProcessFactory
+  package_manager.file_system:
+    class: PhpTuf\ComposerStager\Infrastructure\Filesystem\Filesystem
+    arguments:
+      - '@package_manager.symfony_file_system'
+  package_manager.executable_finder:
+    class: PhpTuf\ComposerStager\Infrastructure\Process\ExecutableFinder
+    arguments:
+      - '@package_manager.symfony_executable_finder'
+
+  # Executable runners.
+  package_manager.rsync_runner:
+    class: PhpTuf\ComposerStager\Infrastructure\Process\Runner\RsyncRunner
+    arguments:
+      - '@package_manager.executable_finder'
+      - '@package_manager.process_factory'
+  package_manager.composer_runner:
+    class: PhpTuf\ComposerStager\Infrastructure\Process\Runner\ComposerRunner
+    arguments:
+      - '@package_manager.executable_finder'
+      - '@package_manager.process_factory'
+
+  # File copiers.
+  package_manager.file_copier.rsync:
+    class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopier
+    arguments:
+      - '@package_manager.file_system'
+      - '@package_manager.rsync_runner'
+  package_manager.file_copier.php:
+    class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopier
+    arguments:
+      - '@package_manager.file_system'
+      - '@package_manager.symfony_finder'
+      - '@package_manager.symfony_finder'
+  package_manager.file_copier.factory:
+    class: Drupal\package_manager\FileCopierFactory
+    arguments:
+      - '@package_manager.symfony_executable_finder'
+      - '@package_manager.file_copier.php'
+      - '@package_manager.file_copier.rsync'
+      - '@config.factory'
+  package_manager.file_copier:
+    class: PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierInterface
+    factory: ['@package_manager.file_copier.factory', 'create']
+
+  # Domain services.
+  package_manager.beginner:
+    class: PhpTuf\ComposerStager\Domain\Beginner
+    arguments:
+      - '@package_manager.file_copier'
+      - '@package_manager.file_system'
+  package_manager.stager:
+    class: PhpTuf\ComposerStager\Domain\Stager
+    arguments:
+      - '@package_manager.composer_runner'
+      - '@package_manager.file_system'
+  package_manager.committer:
+    class: PhpTuf\ComposerStager\Domain\Committer
+    arguments:
+      - '@package_manager.file_copier'
+      - '@package_manager.file_system'
+  package_manager.cleaner:
+    class: PhpTuf\ComposerStager\Domain\Cleaner
+    arguments:
+      - '@package_manager.file_system'

package_manager/src/FileCopierFactory.php

+<?php
+
+namespace Drupal\package_manager;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierFactory as StagerFileCopierFactory;
+use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierFactoryInterface;
+use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierInterface;
+use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopierInterface;
+use PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopierInterface;
+use Symfony\Component\Process\ExecutableFinder;
+
+/**
+ * A file copier factory which returns file copiers according to configuration.
+ */
+class FileCopierFactory implements FileCopierFactoryInterface {
+
+  /**
+   * The decorated file copier factory.
+   *
+   * @var \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\FileCopierFactoryInterface
+   */
+  protected $decorated;
+
+  /**
+   * The PHP file copier service.
+   *
+   * @var \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopierInterface
+   */
+  protected $phpFileCopier;
+
+  /**
+   * The rsync file copier service.
+   *
+   * @var \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopierInterface
+   */
+  protected $rsyncFileCopier;
+
+  /**
+   * The config factory service.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * Constructs a FileCopierFactory object.
+   *
+   * @param \Symfony\Component\Process\ExecutableFinder $executable_finder
+   *   The Symfony executable finder.
+   * @param \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\PhpFileCopierInterface $php_file_copier
+   *   The PHP file copier service.
+   * @param \PhpTuf\ComposerStager\Infrastructure\Process\FileCopier\RsyncFileCopierInterface $rsync_file_copier
+   *   The rsync file copier service.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
+   */
+  public function __construct(ExecutableFinder $executable_finder, PhpFileCopierInterface $php_file_copier, RsyncFileCopierInterface $rsync_file_copier, ConfigFactoryInterface $config_factory) {
+    $this->decorated = new StagerFileCopierFactory($executable_finder, $php_file_copier, $rsync_file_copier);
+    $this->phpFileCopier = $php_file_copier;
+    $this->rsyncFileCopier = $rsync_file_copier;
+    $this->configFactory = $config_factory;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function create(): FileCopierInterface {
+    $copier = $this->configFactory->get('package_manager.settings')
+      ->get('file_copier');
+
+    switch ($copier) {
+      case 'rsync':
+        return $this->rsyncFileCopier;
+
+      case 'php':
+        return $this->phpFileCopier;
+
+      default:
+        return $this->decorated->create();
+    }
+  }
+
+}

src/ComposerStager/ProcessFactory.php → package_manager/src/ProcessFactory.php

 <?php
 
-namespace Drupal\automatic_updates\ComposerStager;
+namespace Drupal\package_manager;
 
 use PhpTuf\ComposerStager\Infrastructure\Process\ProcessFactory as StagerProcessFactory;
 use PhpTuf\ComposerStager\Infrastructure\Process\ProcessFactoryInterface;

package_manager/tests/modules/package_manager_bypass/package_manager_bypass.info.yml

+name: 'Package Manager Bypass'
+description: 'Mocks Package Manager services for functional testing.'
+type: module
+package: Testing
+dependencies:
+  - automatic_updates:package_manager

package_manager/tests/modules/package_manager_bypass/package_manager_bypass.services.yml

+services:
+  package_manager_bypass.committer:
+    public: false
+    class: Drupal\package_manager_bypass\Committer
+    decorates: package_manager.committer
+    arguments:
+      - '@package_manager_bypass.committer.inner'
+    properties:
+      - { _serviceId: package_manager.committer }

tests/modules/composer_stager_bypass/src/Beginner.php → package_manager/tests/modules/package_manager_bypass/src/Beginner.php

 <?php
 
-namespace Drupal\composer_stager_bypass;
+namespace Drupal\package_manager_bypass;
 
 use PhpTuf\ComposerStager\Domain\BeginnerInterface;
 use PhpTuf\ComposerStager\Domain\Output\ProcessOutputCallbackInterface;

tests/modules/composer_stager_bypass/src/Committer.php → package_manager/tests/modules/package_manager_bypass/src/Committer.php

 <?php
 
-namespace Drupal\composer_stager_bypass;
+namespace Drupal\package_manager_bypass;
 
 use PhpTuf\ComposerStager\Domain\CommitterInterface;
 use PhpTuf\ComposerStager\Domain\Output\ProcessOutputCallbackInterface;

tests/modules/composer_stager_bypass/src/ComposerStagerBypassServiceProvider.php → package_manager/tests/modules/package_manager_bypass/src/PackageManagerBypassServiceProvider.php

 <?php
 
-namespace Drupal\composer_stager_bypass;
+namespace Drupal\package_manager_bypass;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\ServiceProviderBase;
 
 /**
- * Defines services to bypass Composer Stager's core functionality.
+ * Defines services to bypass Package Manager's core functionality.
  */
-class ComposerStagerBypassServiceProvider extends ServiceProviderBase {
+class PackageManagerBypassServiceProvider extends ServiceProviderBase {
 
   /**
    * {@inheritdoc}
@@ -16,9 +16,9 @@ class ComposerStagerBypassServiceProvider extends ServiceProviderBase {
   public function alter(ContainerBuilder $container) {
     parent::alter($container);
 
-    $container->getDefinition('automatic_updates.beginner')
+    $container->getDefinition('package_manager.beginner')
       ->setClass(Beginner::class);
-    $container->getDefinition('automatic_updates.stager')
+    $container->getDefinition('package_manager.stager')
       ->setClass(Stager::class);
   }