.gitattributes

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

automatic_updates.module

@@ -29,12 +29,20 @@ 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' => ComposerExecutableValidator::MINIMUM_COMPOSER_VERSION_CONSTRAINT]) . '</p>';
-      $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 .= '<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>';
+      $output .= t('Automatic Updates supports updating from one minor version of Drupal core to another; for example, from Drupal 9.4.8 to Drupal 9.5.0. This is only allowed when updating via <a href=":url">the user interface</a>. Unattended background updates can only update <em>within</em> the currently installed minor version (for example, Drupal 9.4.6 to 9.4.8).', [
+        ':url' => Url::fromRoute('update.report_update')->toString(),
+      ]);
+      $output .= '</p>';
+      $output .= '<p>' . t('This is because updating from one minor version of Drupal to another is riskier than staying within the current minor version. New minor versions of Drupal introduce changes that can, in some situations, be incompatible with installed modules and themes.') . '</p>';
+      $output .= '<p>' . t('Therefore, if you want to use Automatic Updates to update to another minor version of Drupal, it is strongly recommended to do a test update first, ideally on an isolated development copy of your site, before updating your production site.') . '</p>';
       return $output;
   }
 }
@@ -135,7 +143,6 @@ function automatic_updates_module_implements_alter(&$implementations, $hook) {
     unset($implementations['update']);
   }
   if ($hook === 'cron') {
-    // Whatever mofo.
     $hook = $implementations['automatic_updates'];
     unset($implementations['automatic_updates']);
     $implementations['automatic_updates'] = $hook;

automatic_updates.services.yml

@@ -61,66 +61,6 @@ services:
     class: Drupal\automatic_updates\ReleaseChooser
     arguments:
       - '@automatic_updates.validator.version_policy'
-  automatic_updates.composer_executable_validator:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.composer_executable'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.settings_validator:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.settings'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.environment_support:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.environment_support'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.composer_settings:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.composer_settings'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.disk_space_validator:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.disk_space'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.pending_updates_validator:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.pending_updates'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.file_system_permissions:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.file_system'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.multisite:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.multisite'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.symlink:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.symlink'
-    tags:
-      - { name: event_subscriber }
-  automatic_updates.validator.patches:
-    class: Drupal\automatic_updates\Validator\PackageManagerReadinessCheck
-    arguments:
-      - '@package_manager.validator.patches'
-    tags:
-      - { name: event_subscriber }
   automatic_updates.cron_frequency_validator:
     class: Drupal\automatic_updates\Validator\CronFrequencyValidator
     arguments:

automatic_updates_extensions/src/BatchProcessor.php

@@ -117,6 +117,15 @@ final class BatchProcessor {
   public static function commit(string $stage_id, array &$context): void {
     try {
       static::getUpdater()->claim($stage_id)->apply();
+      // The batch system does not allow any single request to run for longer
+      // than a second, so this will force the next operation to be done in a
+      // new request. This helps keep the running code in as consistent a state
+      // as possible.
+      // @see \Drupal\package_manager\Stage::apply()
+      // @see \Drupal\package_manager\Stage::postApply()
+      // @todo See if there's a better way to ensure the post-apply tasks run
+      //   in a new request in https://www.drupal.org/i/3293150.
+      sleep(1);
     }
     catch (\Throwable $e) {
       static::handleException($e, $context);

automatic_updates_extensions/src/ExtensionUpdater.php

@@ -108,7 +108,7 @@ class ExtensionUpdater extends Stage {
       parent::dispatch($event, $on_error);
     }
     catch (StageValidationException $e) {
-      throw new UpdateException($e->getResults(), $e->getMessage() ?: "Unable to complete the update because of errors.", $e->getCode(), $e);
+      throw new UpdateException($e->getResults(), $e->getMessage(), $e->getCode(), $e);
     }
   }
 

automatic_updates_extensions/src/Form/UpdateReady.php

@@ -2,15 +2,15 @@
 
 namespace Drupal\automatic_updates_extensions\Form;
 
+use Drupal\automatic_updates\Form\UpdateFormBase;
 use Drupal\package_manager\Exception\ApplyFailedException;
 use Drupal\package_manager\ProjectInfo;
-use Drupal\package_manager\Validator\StagedDBUpdateValidator;
+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\Core\Batch\BatchBuilder;
 use Drupal\Core\Extension\ModuleExtensionList;
-use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Messenger\MessengerInterface;
@@ -18,7 +18,9 @@ use Drupal\Core\State\StateInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\package_manager\Exception\StageException;
 use Drupal\package_manager\Exception\StageOwnershipException;
+use Drupal\system\SystemManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Defines a form to commit staged updates.
@@ -26,7 +28,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * @internal
  *   Form classes are internal.
  */
-final class UpdateReady extends FormBase {
+final class UpdateReady extends UpdateFormBase {
 
   /**
    * The updater service.
@@ -50,18 +52,18 @@ final class UpdateReady extends FormBase {
   protected $moduleList;
 
   /**
-   * The staged database update validator service.
+   * The renderer service.
    *
-   * @var \Drupal\package_manager\Validator\StagedDBUpdateValidator
+   * @var \Drupal\Core\Render\RendererInterface
    */
-  protected $stagedDatabaseUpdateValidator;
+  protected $renderer;
 
   /**
-   * The renderer service.
+   * The event dispatcher.
    *
-   * @var \Drupal\Core\Render\RendererInterface
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
    */
-  protected $renderer;
+  protected $eventDispatcher;
 
   /**
    * Constructs a new UpdateReady object.
@@ -74,18 +76,18 @@ final class UpdateReady extends FormBase {
    *   The state service.
    * @param \Drupal\Core\Extension\ModuleExtensionList $module_list
    *   The module list service.
-   * @param \Drupal\package_manager\Validator\StagedDBUpdateValidator $staged_database_update_validator
-   *   The staged database update validator service.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer service.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
+   *   Event dispatcher service.
    */
-  public function __construct(ExtensionUpdater $updater, MessengerInterface $messenger, StateInterface $state, ModuleExtensionList $module_list, StagedDBUpdateValidator $staged_database_update_validator, RendererInterface $renderer) {
+  public function __construct(ExtensionUpdater $updater, MessengerInterface $messenger, StateInterface $state, ModuleExtensionList $module_list, RendererInterface $renderer, EventDispatcherInterface $event_dispatcher) {
     $this->updater = $updater;
     $this->setMessenger($messenger);
     $this->state = $state;
     $this->moduleList = $module_list;
-    $this->stagedDatabaseUpdateValidator = $staged_database_update_validator;
     $this->renderer = $renderer;
+    $this->eventDispatcher = $event_dispatcher;
   }
 
   /**
@@ -104,8 +106,8 @@ final class UpdateReady extends FormBase {
       $container->get('messenger'),
       $container->get('state'),
       $container->get('extension.list.module'),
-      $container->get('package_manager.validator.staged_database_updates'),
-      $container->get('renderer')
+      $container->get('renderer'),
+      $container->get('event_dispatcher')
     );
   }
 
@@ -127,23 +129,6 @@ final class UpdateReady extends FormBase {
 
     $messages = [];
 
-    // If there are any installed extension with database updates in the staging
-    // area, warn the user that they might be sent to update.php once the staged
-    // changes have been applied.
-    $pending_updates = $this->stagedDatabaseUpdateValidator->getExtensionsWithDatabaseUpdates($this->updater);
-    if ($pending_updates) {
-      natcasesort($pending_updates);
-      $message_item_list = [
-        '#theme' => 'item_list',
-        '#prefix' => '<p>' . $this->t('Possible database updates were detected in the following extensions; you may be redirected to the database update page in order to complete the update process.') . '</p>',
-        '#items' => $pending_updates,
-        '#context' => [
-          'list_style' => 'automatic-updates-extensions__pending-database-updates',
-        ],
-      ];
-      $messages[MessengerInterface::TYPE_WARNING][] = $this->renderer->renderRoot($message_item_list);
-    }
-
     // Don't set any messages if the form has been submitted, because we don't
     // want them to be set during form submit.
     if (!$form_state->getUserInput()) {
@@ -177,6 +162,18 @@ final class UpdateReady extends FormBase {
       '#type' => 'checkbox',
       '#default_value' => TRUE,
     ];
+
+    // Don't run the status checks once the form has been submitted.
+    if (!$form_state->getUserInput()) {
+      $results = $this->runStatusCheck($this->updater, $this->eventDispatcher);
+      // This will have no effect if $results is empty.
+      $this->displayResults($results, $this->renderer);
+      // If any errors occurred, return the form early so the user cannot
+      // continue.
+      if (ValidationResult::getOverallSeverity($results) === SystemManager::REQUIREMENT_ERROR) {
+        return $form;
+      }
+    }
     $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Continue'),

automatic_updates_extensions/src/Form/UpdaterForm.php

@@ -2,12 +2,10 @@
 
 namespace Drupal\automatic_updates_extensions\Form;
 
-use Drupal\automatic_updates\Event\ReadinessCheckEvent;
-use Drupal\automatic_updates\Validation\ReadinessTrait;
+use Drupal\automatic_updates\Form\UpdateFormBase;
 use Drupal\automatic_updates_extensions\BatchProcessor;
 use Drupal\automatic_updates_extensions\ExtensionUpdater;
 use Drupal\Core\Batch\BatchBuilder;
-use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Messenger\MessengerInterface;
@@ -16,6 +14,7 @@ use Drupal\Core\Url;
 use Drupal\package_manager\Exception\ApplyFailedException;
 use Drupal\package_manager\FailureMarker;
 use Drupal\package_manager\ProjectInfo;
+use Drupal\package_manager\ValidationResult;
 use Drupal\system\SystemManager;
 use Drupal\update\UpdateManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -27,9 +26,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  * @internal
  *   Form classes are internal.
  */
-final class UpdaterForm extends FormBase {
-
-  use ReadinessTrait;
+final class UpdaterForm extends UpdateFormBase {
 
   /**
    * The extension updater service.
@@ -165,12 +162,10 @@ final class UpdaterForm extends FormBase {
       $results = [];
     }
     else {
-      $event = new ReadinessCheckEvent($this->extensionUpdater);
-      $this->eventDispatcher->dispatch($event);
-      $results = $event->getResults();
+      $results = $this->runStatusCheck($this->extensionUpdater, $this->eventDispatcher, TRUE);
     }
-    $this->displayResults($results, $this->messenger(), $this->renderer);
-    $security_level = $this->getOverallSeverity($results);
+    $this->displayResults($results, $this->renderer);
+    $security_level = ValidationResult::getOverallSeverity($results);
 
     if ($update_projects && $security_level !== SystemManager::REQUIREMENT_ERROR) {
       $form['actions'] = $this->actions($form_state);

automatic_updates_extensions/src/Validator/UpdateReleaseValidator.php

@@ -103,7 +103,7 @@ final class UpdateReleaseValidator implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       PreCreateEvent::class => 'checkRelease',
     ];

automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php

@@ -2,13 +2,14 @@
 
 namespace Drupal\Tests\automatic_updates_extensions\Functional;
 
-use Drupal\automatic_updates\Event\ReadinessCheckEvent;
 use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
 use Drupal\package_manager_test_validation\StagedDatabaseUpdateValidator;
 use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\Event\StatusCheckEvent;
 use Drupal\package_manager\ValidationResult;
 use Drupal\package_manager_bypass\Committer;
 use Drupal\package_manager_bypass\Stager;
+use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
 use Drupal\Tests\automatic_updates\Functional\AutomaticUpdatesFunctionalTestBase;
 use Drupal\Tests\automatic_updates\Traits\ValidationTestTrait;
 use Drupal\Tests\automatic_updates_extensions\Traits\FormTestTrait;
@@ -192,11 +193,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     // Ensure that a list of pending database updates is visible, along with a
     // short explanation, in the warning messages.
     $warning_messages = $assert_session->elementExists('xpath', '//div[@data-drupal-messages]//div[@aria-label="Warning message"]');
-    $this->assertStringContainsString('Possible database updates were detected in the following extensions; you may be redirected to the database update page in order to complete the update process.', $warning_messages->getText());
-    $pending_updates = $warning_messages->findAll('css', 'ul.item-list__automatic-updates-extensions__pending-database-updates li');
-    $this->assertCount(2, $pending_updates);
-    $this->assertSame('Automatic Updates Theme With Updates', $pending_updates[0]->getText());
-    $this->assertSame('System', $pending_updates[1]->getText());
+    $this->assertStringContainsString('Possible database updates have been detected in the following extensions.<ul><li>System</li><li>Automatic Updates Theme With Updates</li></ul>', $warning_messages->getHtml());
 
     $page->pressButton('Continue');
     $this->checkForMetaRefresh();
@@ -207,6 +204,14 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session->pageTextContainsOnce('Update complete!');
     // Confirm the site was returned to the original maintenance mode state.
     $this->assertSame($state->get('system.maintenance_mode'), $maintenance_mode_on);
+    // Confirm that the apply and post-apply operations happened in
+    // separate requests.
+    // @see \Drupal\automatic_updates_test\EventSubscriber\RequestTimeRecorder
+    $pre_apply_time = $state->get('Drupal\package_manager\Event\PreApplyEvent time');
+    $post_apply_time = $state->get('Drupal\package_manager\Event\PostApplyEvent time');
+    $this->assertNotEmpty($pre_apply_time);
+    $this->assertNotEmpty($post_apply_time);
+    $this->assertNotSame($pre_apply_time, $post_apply_time);
   }
 
   /**
@@ -426,7 +431,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->assertUpdatesCount(1);
     $message = t("You've not experienced Shakespeare until you have read him in the original Klingon.");
     $error = ValidationResult::createError([$message]);
-    TestSubscriber1::setTestResult([$error], ReadinessCheckEvent::class);
+    TestSubscriber1::setTestResult([$error], StatusCheckEvent::class);
     $this->getSession()->reload();
     $assert->pageTextContains($message);
     $assert->pageTextContains(static::$errorsExplanation);
@@ -444,15 +449,69 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->checkForUpdates();
     $message = t("Warning! Updating this module may cause an error.");
     $warning = ValidationResult::createWarning([$message]);
-    TestSubscriber1::setTestResult([$warning], ReadinessCheckEvent::class);
+    TestSubscriber1::setTestResult([$warning], StatusCheckEvent::class);
     // Navigate to the automatic updates form.
     $this->drupalGet('/admin/reports/updates');
     $this->clickLink('Update Extensions');
     $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
     $this->assertUpdatesCount(1);
-    $assert->pageTextContains(static::$warningsExplanation);
+    $this->checkForMetaRefresh();
     $assert->pageTextNotContains(static::$errorsExplanation);
+    $assert->elementExists('css', '#edit-projects-semver-test')->check();
+    $assert->checkboxChecked('edit-projects-semver-test');
+    $assert->pageTextContains(static::$warningsExplanation);
     $assert->buttonExists('Update');
+
+    // Add warnings from StatusCheckEvent.
+    $summary_status_check_event = t('Some summary');
+    $messages_status_check_event = [
+      "The only thing we're allowed to do is to",
+      "believe that we won't regret the choice",
+      "we made.",
+    ];
+    $warning_status_check_event = ValidationResult::createWarning($messages_status_check_event, $summary_status_check_event);
+    TestSubscriber::setTestResult([$warning_status_check_event], StatusCheckEvent::class);
+    $this->getSession()->getPage()->pressButton('Update');
+    $this->checkForMetaRefresh();
+    $assert->buttonExists('Continue');
+    $assert->pageTextContains($summary_status_check_event);
+    foreach ($messages_status_check_event as $message) {
+      $assert->pageTextContains($message);
+    }
+  }
+
+  /**
+   * Tests that messages from StatusCheckEvent are shown on the confirmation form.
+   */
+  public function testStatusErrorMessages(): void {
+    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
+    $assert = $this->assertSession();
+    $this->setProjectInstalledVersion(['semver_test' => '8.1.0']);
+    $this->checkForUpdates();
+    $this->drupalGet('admin/reports/updates/automatic-update-extensions');
+    $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
+    $this->assertUpdatesCount(1);
+    $this->getSession()->reload();
+    $assert->elementExists('css', '#edit-projects-semver-test')->check();
+    $assert->checkboxChecked('edit-projects-semver-test');
+    $assert->buttonExists('Update');
+    $messages = [
+      "The only thing we're allowed to do is to",
+      "believe that we won't regret the choice",
+      "we made.",
+    ];
+    $summary = t('Some summary');
+    $error = ValidationResult::createError($messages, $summary);
+    TestSubscriber::setTestResult([$error], StatusCheckEvent::class);
+    $this->getSession()->getPage()->pressButton('Update');
+    $this->checkForMetaRefresh();
+    $assert->pageTextContains(static::$errorsExplanation);
+    $assert->pageTextNotContains(static::$warningsExplanation);
+    $assert->pageTextContains($summary);
+    foreach ($messages as $message) {
+      $assert->pageTextContains($message);
+    }
+    $assert->buttonNotExists('Continue');
   }
 
   /**

automatic_updates_extensions/tests/src/Kernel/ExtensionUpdaterTest.php

@@ -2,7 +2,12 @@
 
 namespace Drupal\Tests\automatic_updates_extensions\Kernel;
 
-use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
+use Drupal\automatic_updates\Exception\UpdateException;
+use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
+use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\Event\PreCreateEvent;
+use Drupal\package_manager\Event\PreRequireEvent;
+use Drupal\package_manager\ValidationResult;
 use Drupal\Tests\user\Traits\UserCreationTrait;
 
 /**
@@ -10,7 +15,7 @@ use Drupal\Tests\user\Traits\UserCreationTrait;
  *
  * @group automatic_updates_extensions
  */
-class ExtensionUpdaterTest extends AutomaticUpdatesKernelTestBase {
+class ExtensionUpdaterTest extends AutomaticUpdatesExtensionsKernelTestBase {
 
   use UserCreationTrait;
 
@@ -146,4 +151,51 @@ class ExtensionUpdaterTest extends AutomaticUpdatesKernelTestBase {
     ]);
   }
 
+  /**
+   * Tests UpdateException handling.
+   *
+   * @param string $event_class
+   *   The stage life cycle event which should raise an error.
+   *
+   * @dataProvider providerUpdateException
+   */
+  public function testUpdateException(string $event_class): void {
+    $this->createVirtualProject(__DIR__ . '/../../fixtures/fake-site');
+    $extension_updater = $this->container->get('automatic_updates_extensions.updater');
+    $results = [
+      ValidationResult::createError(['An error of some sorts.']),
+    ];
+    TestSubscriber1::setTestResult($results, $event_class);
+    try {
+      $extension_updater->begin(['my_module' => '9.8.1']);
+      $extension_updater->stage();
+      $extension_updater->apply();
+      $this->fail('Expected an exception, but none was raised.');
+    }
+    catch (UpdateException $e) {
+      $this->assertStringStartsWith('An error of some sorts.', $e->getMessage());
+      $this->assertInstanceOf($event_class, $e->event);
+    }
+  }
+
+  /**
+   * Data provider for testUpdateException().
+   *
+   * @return string[][]
+   *   The test cases.
+   */
+  public function providerUpdateException(): array {
+    return [
+      'pre-create exception' => [
+        PreCreateEvent::class,
+      ],
+      'pre-require exception' => [
+        PreRequireEvent::class,
+      ],
+      'pre-apply exception' => [
+        PreApplyEvent::class,
+      ],
+    ];
+  }
+
 }

dictionary.txt

+unrequested
+updater's
+stager's
+syncer
+syncers
+unrequested

drupalci.yml

@@ -28,11 +28,10 @@ build:
           - sed -i "s/core\/scripts\/js/js/" modules/contrib/automatic_updates/commit-code-check.sh
           # Uncomment to Check all files
           #- sed -i "s/git diff --name-only HEAD~1 HEAD/find \* -type f -not -path \"\.\/\.git\*\"/" modules/contrib/automatic_updates/commit-code-check.sh
-          # 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/bangpow/syncer/" core/misc/cspell/dictionary.txt
-          - sed -i "s/bakeware/syncers/" core/misc/cspell/dictionary.txt
+          # Make cspell examine our files.
+          - sed -i "s/yarn run -s spellcheck/yarn run -s spellcheck --root \$TOP_LEVEL/" modules/contrib/automatic_updates/commit-code-check.sh
+          # Add our words to the dictionary.
+          - cat modules/contrib/automatic_updates/dictionary.txt >> 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.

package_manager/package_manager.module

@@ -8,6 +8,8 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\package_manager\Validator\ComposerExecutableValidator;
 
+// cspell:ignore grasmash
+
 /**
  * Implements hook_help().
  */

package_manager/package_manager.services.yml

@@ -49,6 +49,12 @@ services:
     class: Drupal\package_manager\FailureMarker
     arguments:
       - '@package_manager.path_locator'
+  package_manager.update_data_subscriber:
+    class: Drupal\package_manager\EventSubscriber\UpdateDataSubscriber
+    arguments:
+      - '@update.manager'
+    tags:
+      - { name: event_subscriber }
 
   # Validators.
   package_manager.validator.environment_support:

package_manager/src/Event/RequireEventTrait.php

@@ -35,9 +35,9 @@ trait RequireEventTrait {
    *   The stage.
    * @param string[] $runtime_packages
    *   The runtime (i.e., non-dev) packages to be required, in the form
-   *   'vendor/name:constrant'.
+   *   'vendor/name:constraint'.
    * @param string[] $dev_packages
-   *   The dev packages to be required, in the form 'vendor/name:constrant'.
+   *   The dev packages to be required, in the form 'vendor/name:constraint'.
    */
   public function __construct(Stage $stage, array $runtime_packages, array $dev_packages = []) {
     $this->runtimePackages = $runtime_packages;

package_manager/src/EventSubscriber/UpdateDataSubscriber.php

@@ -48,7 +48,7 @@ final class UpdateDataSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       PostApplyEvent::class => ['clearData', 1000],
     ];

package_manager/src/FailureMarker.php

@@ -12,7 +12,7 @@ use Drupal\package_manager\Exception\ApplyFailedException;
  * code is copied back into it, and then removed afterwards. This allows us to
  * know if a commit operation failed midway through, which could leave the site
  * code base in an indeterminate state -- which, in the worst case scenario,
- * might render Drupal unbootable.
+ * might render Drupal being unable to boot.
  */
 final class FailureMarker {
 

package_manager/src/PackageManagerServiceProvider.php

@@ -4,12 +4,10 @@ namespace Drupal\package_manager;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\ServiceProviderBase;
-use Drupal\package_manager\EventSubscriber\UpdateDataSubscriber;
 use PhpTuf\ComposerStager\Domain\Core\Beginner\BeginnerInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
-use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Defines dynamic container services for Package Manager.
@@ -44,15 +42,6 @@ final class PackageManagerServiceProvider extends ServiceProviderBase {
       $path . '/Domain/Exception',
       $path . '/Infrastructure/Value',
     ]);
-
-    if (array_key_exists('update', $container->getParameter('container.modules'))) {
-      $container->register('package_manager.update_data_subscriber')
-        ->setClass(UpdateDataSubscriber::class)
-        ->setArguments([
-          new Reference('update.manager'),
-        ])
-        ->addTag('event_subscriber');
-    }
   }
 
 }

package_manager/src/PathExcluder/GitExcluder.php

@@ -34,7 +34,7 @@ final class GitExcluder implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       PreCreateEvent::class => 'excludeGitDirectories',
       PreApplyEvent::class => 'excludeGitDirectories',

package_manager/src/PathExcluder/SiteConfigurationExcluder.php

@@ -69,7 +69,7 @@ class SiteConfigurationExcluder implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       PreCreateEvent::class => 'excludeSiteConfiguration',
       PreApplyEvent::class => 'excludeSiteConfiguration',