automatic_updates.routing.yml

@@ -7,6 +7,7 @@ automatic_updates.update_readiness:
     _permission: 'administer software updates'
   options:
     _maintenance_access: TRUE
+    _automatic_updates_readiness_messages: skip
 automatic_updates.confirmation_page:
   path: '/admin/automatic-update-ready/{stage_id}'
   defaults:
@@ -16,6 +17,7 @@ automatic_updates.confirmation_page:
     _permission: 'administer software updates'
   options:
     _maintenance_access: TRUE
+    _automatic_updates_readiness_messages: skip
 automatic_updates.finish:
   path: '/automatic-update/finish'
   defaults:
@@ -24,6 +26,7 @@ automatic_updates.finish:
     _permission: 'administer software updates'
   options:
     _maintenance_access: TRUE
+    _automatic_updates_readiness_messages: skip
 # Links to our updater form appear in three different sets of local tasks. To ensure the breadcrumbs and paths are
 # consistent with the other local tasks in each set, we need two separate routes to the same form.
 automatic_updates.report_update:

automatic_updates.services.yml

@@ -129,6 +129,10 @@ services:
       - '@string_translation'
     tags:
       - { name: event_subscriber }
+  automatic_updates.validator.xdebug:
+    class: Drupal\automatic_updates\Validator\XdebugValidator
+    tags:
+      - { name: event_subscriber }
   automatic_updates.validator.target_release:
     class: \Drupal\automatic_updates\Validator\UpdateReleaseValidator
     tags:

package_manager/package_manager.install

@@ -9,12 +9,19 @@
  * Implements hook_requirements().
  */
 function package_manager_requirements() {
+  $requirements = [];
+
   if (!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,
-      ],
+    $requirements['package_manager_composer_dependencies'] = [
+      'description' => t('External dependencies for Package Manager are not available. Composer must be used to download the module with dependencies.'),
+      'severity' => REQUIREMENT_ERROR,
+    ];
+  }
+  if (extension_loaded('xdebug')) {
+    $requirements['package_manager_xdebug'] = [
+      'description' => t('Xdebug is enabled, which may have a negative performance impact on Package Manager and any modules that use it.'),
+      'severity' => REQUIREMENT_WARNING,
     ];
   }
+  return $requirements;
 }

package_manager/package_manager.module

@@ -24,7 +24,7 @@ function package_manager_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<ul>';
       $output .= '<li>' . t('Package Manager can only maintain one copy of the site at any given time. If a copy of the site already exists, another one cannot be created until the existing copy is destroyed.') . '</li>';
       $output .= '<li>' . t('The temporary copy of the site is associated with the user or session that originally created it, and only that user or session can make changes to it.') . '</li>';
-      $output .= '<li>' . t('Modules cannot be uninstalled while Package Manager is syncing changes into live site.') . '<li>';
+      $output .= '<li>' . t('Modules cannot be uninstalled while Package Manager is syncing changes into live site.') . '</li>';
       $output .= '</ul>';
       $output .= '<p>' . t('For more information, see the <a href=":package-manager-documentation">online documentation for the Package Manager module</a>.', [':package-manager-documentation' => 'https://www.drupal.org/docs/8/core/modules/package-manager']) . '</p>';
       return $output;

package_manager/src/Exception/StageValidationException.php

@@ -21,12 +21,15 @@ class StageValidationException extends StageException {
    *
    * @param \Drupal\package_manager\ValidationResult[] $results
    *   Any relevant validation results.
+   * @param string $message
+   *   (optional) The exception message. Defaults to a plain text representation
+   *   of the validation results.
    * @param mixed ...$arguments
-   *   Arguments to pass to the parent constructor.
+   *   Additional arguments to pass to the parent constructor.
    */
-  public function __construct(array $results = [], ...$arguments) {
+  public function __construct(array $results = [], string $message = '', ...$arguments) {
     $this->results = $results;
-    parent::__construct(...$arguments);
+    parent::__construct($message ?: $this->getResultsAsText(), ...$arguments);
   }
 
   /**
@@ -39,4 +42,24 @@ class StageValidationException extends StageException {
     return $this->results;
   }
 
+  /**
+   * Formats the validation results as plain text.
+   *
+   * @return string
+   *   The results, formatted as plain text.
+   */
+  protected function getResultsAsText(): string {
+    $text = '';
+
+    foreach ($this->getResults() as $result) {
+      $messages = $result->getMessages();
+      $summary = $result->getSummary();
+      if ($summary) {
+        array_unshift($messages, $summary);
+      }
+      $text .= implode("\n", $messages) . "\n";
+    }
+    return $text;
+  }
+
 }

package_manager/tests/modules/package_manager_test_validation/src/EventSubscriber/TestSubscriber.php

@@ -54,7 +54,7 @@ class TestSubscriber implements EventSubscriberInterface {
    *   The event class.
    */
   public static function setExit(string $event): void {
-    \Drupal::state()->set(static::STATE_KEY . ".$event", 'exit');
+    \Drupal::state()->set(self::getStateKey($event), 'exit');
   }
 
   /**
@@ -69,7 +69,7 @@ class TestSubscriber implements EventSubscriberInterface {
    *   The event class.
    */
   public static function setTestResult(?array $results, string $event): void {
-    $key = static::STATE_KEY . '.' . $event;
+    $key = static::getStateKey($event);
 
     $state = \Drupal::state();
     if (isset($results)) {
@@ -92,7 +92,7 @@ class TestSubscriber implements EventSubscriberInterface {
    *   The event class.
    */
   public static function setException(?\Throwable $error, string $event): void {
-    $key = static::STATE_KEY . '.' . $event;
+    $key = self::getStateKey($event);
 
     $state = \Drupal::state();
     if (isset($error)) {
@@ -103,6 +103,20 @@ class TestSubscriber implements EventSubscriberInterface {
     }
   }
 
+  /**
+   * Computes the state key to use for a given event class.
+   *
+   * @param string $event
+   *   The event class.
+   *
+   * @return string
+   *   The state key under which to store the results for the given event.
+   */
+  protected static function getStateKey(string $event) {
+    $parts = explode('\\', $event);
+    return static::STATE_KEY . array_pop($parts);
+  }
+
   /**
    * Adds validation results to a stage event.
    *
@@ -110,7 +124,7 @@ class TestSubscriber implements EventSubscriberInterface {
    *   The event object.
    */
   public function handleEvent(StageEvent $event): void {
-    $results = $this->state->get(static::STATE_KEY . '.' . get_class($event), []);
+    $results = $this->state->get(self::getStateKey(get_class($event)), []);
 
     // Record that value of maintenance mode for each event.
     $this->state->set(get_class($event) . '.' . 'system.maintenance_mode', $this->state->get('system.maintenance_mode'));

package_manager/tests/src/Kernel/StageEventsTest.php

@@ -140,7 +140,7 @@ class StageEventsTest extends PackageManagerKernelTestBase implements EventSubsc
     $handler = function (StageEvent $event) use ($event_class): void {
       if (get_class($event) === $event_class) {
         if ($event instanceof PreOperationStageEvent) {
-          $event->addError([['Burn, baby, burn']]);
+          $event->addError(['Burn, baby, burn']);
         }
       }
     };

package_manager/tests/src/Kernel/StageValidationExceptionTest.php

+<?php
+
+namespace Drupal\Tests\package_manager\Kernel;
+
+use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
+use Drupal\package_manager\Event\PreCreateEvent;
+use Drupal\package_manager\Exception\StageValidationException;
+use Drupal\package_manager\ValidationResult;
+
+/**
+ * @coversDefaultClass \Drupal\package_manager\Exception\StageValidationException
+ *
+ * @group package_manager
+ */
+class StageValidationExceptionTest extends PackageManagerKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'package_manager_test_validation',
+  ];
+
+  /**
+   * Data provider for testErrors().
+   *
+   * @return array[]
+   *   The test cases for testErrors().
+   */
+  public function providerResultsAsText(): array {
+    $messages = ['Blam!', 'Kapow!'];
+    $summary = t('There was sadness.');
+
+    $result_no_summary = ValidationResult::createError([$messages[0]]);
+    $result_with_summary = ValidationResult::createError($messages, $summary);
+    $result_with_summary_message = "{$summary->getUntranslatedString()}\n{$messages[0]}\n{$messages[1]}\n";
+
+    return [
+      '1 result with summary' => [
+        [$result_with_summary],
+        $result_with_summary_message,
+      ],
+      '2 results, with summaries' => [
+        [$result_with_summary, $result_with_summary],
+        "$result_with_summary_message$result_with_summary_message",
+      ],
+      '1 result without summary' => [
+        [$result_no_summary],
+        $messages[0],
+      ],
+      '2 results without summaries' => [
+        [$result_no_summary, $result_no_summary],
+        $messages[0] . "\n" . $messages[0],
+      ],
+      '1 result with summary, 1 result without summary' => [
+        [$result_with_summary, $result_no_summary],
+        $result_with_summary_message . $messages[0] . "\n",
+      ],
+    ];
+  }
+
+  /**
+   * Tests formatting a set of validation results as plain text.
+   *
+   * @param \Drupal\package_manager\ValidationResult[] $validation_results
+   *   The expected validation results which should be logged.
+   * @param string $expected_message
+   *   The expected exception message.
+   *
+   * @dataProvider providerResultsAsText
+   *
+   * @covers ::getResultsAsText()
+   */
+  public function testResultsAsText(array $validation_results, string $expected_message): void {
+    TestSubscriber1::setTestResult($validation_results, PreCreateEvent::class);
+    $this->expectException(StageValidationException::class);
+    $this->expectExceptionMessage($expected_message);
+    $this->createStage()->create();
+  }
+
+}

src/BatchProcessor.php

@@ -49,9 +49,7 @@ class BatchProcessor {
    *   have been recorded.
    */
   protected static function handleException(\Throwable $error, array &$context): void {
-    $error_messages = [
-      $error->getMessage(),
-    ];
+    $error_messages = [];
 
     if ($error instanceof StageValidationException) {
       foreach ($error->getResults() as $result) {
@@ -62,6 +60,9 @@ class BatchProcessor {
         $error_messages = array_merge($error_messages, $messages);
       }
     }
+    else {
+      $error_messages[] = $error->getMessage();
+    }
 
     foreach ($error_messages as $error_message) {
       $context['results']['errors'][] = $error_message;

src/CronUpdater.php

@@ -111,7 +111,7 @@ class CronUpdater extends Updater {
       );
     }
     catch (\Throwable $e) {
-      $this->handleException($e);
+      $this->logger->error($e->getMessage());
     }
 
     // If an error occurred during the pre-create event, the stage will be
@@ -129,7 +129,7 @@ class CronUpdater extends Updater {
       $this->destroy();
     }
     catch (StageValidationException $e) {
-      $this->handleException($e);
+      $this->logger->error($e->getMessage());
     }
   }
 
@@ -143,44 +143,4 @@ class CronUpdater extends Updater {
     return $this->configFactory->get('automatic_updates.settings')->get('cron') === static::DISABLED;
   }
 
-  /**
-   * Generates a log message from a stage validation exception.
-   *
-   * @param \Drupal\package_manager\Exception\StageValidationException $exception
-   *   The validation exception.
-   *
-   * @return string
-   *   The formatted log message, including all the validation results.
-   */
-  protected static function formatValidationException(StageValidationException $exception): string {
-    $log_message = '';
-    foreach ($exception->getResults() as $result) {
-      $summary = $result->getSummary();
-      if ($summary) {
-        $log_message .= "<h3>$summary</h3><ul>";
-        foreach ($result->getMessages() as $message) {
-          $log_message .= "<li>$message</li>";
-        }
-        $log_message .= "</ul>";
-      }
-      else {
-        $log_message .= ($log_message ? ' ' : '') . $result->getMessages()[0];
-      }
-    }
-    return "<h2>{$exception->getMessage()}</h2>$log_message";
-  }
-
-  /**
-   * Handles an exception that is caught during an update.
-   *
-   * @param \Throwable $e
-   *   The caught exception.
-   */
-  protected function handleException(\Throwable $e): void {
-    $message = $e instanceof StageValidationException
-      ? static::formatValidationException($e)
-      : $e->getMessage();
-    $this->logger->error($message);
-  }
-
 }

src/Routing/RouteSubscriber.php

@@ -27,6 +27,7 @@ class RouteSubscriber extends RouteSubscriberBase {
       'update.settings',
       'system.status',
       'update.confirmation_page',
+      'system.batch_page.html',
     ];
     foreach ($disabled_routes as $route) {
       $route = $collection->get($route);

src/Validator/XdebugValidator.php

+<?php
+
+namespace Drupal\automatic_updates\Validator;
+
+use Drupal\automatic_updates\Event\ReadinessCheckEvent;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Flags a warning if Xdebug is enabled.
+ */
+class XdebugValidator implements EventSubscriberInterface {
+
+  use StringTranslationTrait;
+
+  /**
+   * Flags a warning if Xdebug is enabled.
+   *
+   * @param \Drupal\automatic_updates\Event\ReadinessCheckEvent $event
+   *   The event object.
+   */
+  public function checkForXdebug(ReadinessCheckEvent $event): void {
+    if (extension_loaded('xdebug')) {
+      $event->addWarning([
+        $this->t('Xdebug is enabled, which may cause timeout errors during automatic updates.'),
+      ]);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    return [
+      ReadinessCheckEvent::class => 'checkForXdebug',
+    ];
+  }
+
+}

tests/src/Functional/UpdaterFormTest.php

@@ -153,17 +153,10 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session = $this->assertSession();
     $page = $session->getPage();
 
-    // Store a fake readiness error, which will be cached.
-    $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);
-
-    $this->drupalGet('/admin/reports/status');
-    $page->clickLink('Run readiness checks');
-    $assert_session->pageTextContainsOnce((string) $message);
+    $cached_message = $this->setAndAssertCachedMessage();
     // Ensure that the fake error is cached.
     $session->reload();
-    $assert_session->pageTextContainsOnce((string) $message);
+    $assert_session->pageTextContainsOnce($cached_message);
 
     $this->setCoreVersion('9.8.0');
     $this->checkForUpdates();
@@ -184,7 +177,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session->pageTextContainsOnce((string) $expected_results[0]->getMessages()[0]);
     $assert_session->pageTextContainsOnce(static::$errorsExplanation);
     $assert_session->pageTextNotContains(static::$warningsExplanation);
-    $assert_session->pageTextNotContains((string) $message);
+    $assert_session->pageTextNotContains($cached_message);
     TestSubscriber1::setTestResult(NULL, ReadinessCheckEvent::class);
 
     // Make the validator throw an exception during pre-create.
@@ -193,6 +186,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $session->reload();
     $assert_session->pageTextNotContains(static::$errorsExplanation);
     $assert_session->pageTextNotContains(static::$warningsExplanation);
+    $assert_session->pageTextNotContains($cached_message);
     $page->pressButton('Update');
     $this->checkForMetaRefresh();
     $this->assertUpdateStagedTimes(0);
@@ -204,6 +198,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session->pageTextContainsOnce($error->getMessage());
     $assert_session->pageTextNotContains((string) $expected_results[0]->getMessages()[0]);
     $assert_session->pageTextNotContains($expected_results[0]->getSummary());
+    $assert_session->pageTextNotContains($cached_message);
     // Since the error occurred during pre-create, there should be no existing
     // update to delete.
     $assert_session->buttonNotExists('Delete existing update');
@@ -219,6 +214,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     // Since there's only one message, we shouldn't see the summary.
     $assert_session->pageTextNotContains($expected_results[0]->getSummary());
     $assert_session->pageTextContainsOnce((string) $expected_results[0]->getMessages()[0]);
+    $assert_session->pageTextNotContains($cached_message);
   }
 
   /**
@@ -369,6 +365,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
   public function testStagedDatabaseUpdates(bool $maintenance_mode_on): void {
     $this->setCoreVersion('9.8.0');
     $this->checkForUpdates();
+    $cached_message = $this->setAndAssertCachedMessage();
 
     $state = $this->container->get('state');
     $state->set('system.maintenance_mode', $maintenance_mode_on);
@@ -386,6 +383,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     // The warning should be visible.
     $assert_session = $this->assertSession();
     $assert_session->pageTextContains(reset($messages));
+    $assert_session->pageTextNotContains($cached_message);
     $page->pressButton('Update');
     $this->checkForMetaRefresh();
     $this->assertUpdateStagedTimes(1);
@@ -403,6 +401,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session->pageTextContains($possible_update_message);
     $assert_session->pageTextContains('System');
     $assert_session->checkboxChecked('maintenance_mode');
+    $assert_session->pageTextNotContains($cached_message);
     $page->pressButton('Continue');
     $this->checkForMetaRefresh();
     // Confirm that the site was in maintenance before the update was applied.
@@ -412,6 +411,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     // update.php.
     $this->assertTrue($state->get('system.maintenance_mode'));
     $assert_session->addressEquals('/update.php');
+    $assert_session->pageTextNotContains($cached_message);
     $assert_session->pageTextNotContains(reset($messages));
     $assert_session->pageTextNotContains($possible_update_message);
     $assert_session->pageTextContainsOnce('Please apply database updates to complete the update process.');
@@ -424,6 +424,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session->pageTextContains('Updates were attempted.');
     // Confirm the site was returned to the original maintenance module state.
     $this->assertSame($state->get('system.maintenance_mode'), $maintenance_mode_on);
+    $assert_session->pageTextNotContains($cached_message);
   }
 
   /**
@@ -464,14 +465,17 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
    * @dataProvider providerSuccessfulUpdate
    */
   public function testSuccessfulUpdate(string $update_form_url, bool $maintenance_mode_on): void {
+    $assert_session = $this->assertSession();
     $this->setCoreVersion('9.8.0');
     $this->checkForUpdates();
     $state = $this->container->get('state');
     $state->set('system.maintenance_mode', $maintenance_mode_on);
-
     $page = $this->getSession()->getPage();
+    $cached_message = $this->setAndAssertCachedMessage();
+
     $this->drupalGet($update_form_url);
     FixtureStager::setFixturePath(__DIR__ . '/../../fixtures/staged/9.8.1');
+    $assert_session->pageTextNotContains($cached_message);
     $page->pressButton('Update');
     $this->checkForMetaRefresh();
     $this->assertUpdateStagedTimes(1);
@@ -480,8 +484,8 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $this->assertSame($state->get('system.maintenance_mode'), $maintenance_mode_on);
     $page->pressButton('Continue');
     $this->checkForMetaRefresh();
-    $assert_session = $this->assertSession();
     $assert_session->addressEquals('/admin/reports/updates');
+    $assert_session->pageTextNotContains($cached_message);
     // Confirm that the site was in maintenance before the update was applied.
     // @see \Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber::handleEvent()
     $this->assertTrue($state->get(PreApplyEvent::class . '.system.maintenance_mode'));
@@ -550,4 +554,28 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     $assert_session->buttonExists('Update');
   }
 
+  /**
+   * Sets an error message, runs readiness checks, and asserts it is displayed.
+   *
+   * @return string
+   *   The cached error check message.
+   */
+  private function setAndAssertCachedMessage(): string {
+    // Store a readiness error, which will be cached.
+    $message = "You've not experienced Shakespeare until you have read him in the original Klingon.";
+    $result = ValidationResult::createError([$message]);
+    TestSubscriber1::setTestResult([$result], ReadinessCheckEvent::class);
+    // Run the readiness checks a visit an admin page the message will be
+    // displayed.
+    $this->drupalGet('/admin/reports/status');
+    $this->clickLink('Run readiness checks');
+    $this->drupalGet('/admin');
+    $this->assertSession()->pageTextContains($message);
+    // Clear the results so the only way the message could appear on the pages
+    // used for the update process is if they show the cached results.
+    TestSubscriber1::setTestResult(NULL, ReadinessCheckEvent::class);
+
+    return $message;
+  }
+
 }

tests/src/Kernel/AutomaticUpdatesKernelTestBase.php

@@ -5,7 +5,6 @@ namespace Drupal\Tests\automatic_updates\Kernel;
 use Drupal\automatic_updates\CronUpdater;
 use Drupal\automatic_updates\Updater;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\package_manager\Exception\StageValidationException;
 use Drupal\Tests\automatic_updates\Traits\ValidationTestTrait;
 use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
 use Drupal\Tests\package_manager\Kernel\TestStage;
@@ -152,11 +151,4 @@ class TestCronUpdater extends CronUpdater {
     return TestStage::$stagingRoot ?: parent::getStagingRoot();
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public static function formatValidationException(StageValidationException $exception): string {
-    return parent::formatValidationException($exception);
-  }
-
 }

tests/src/Kernel/CronUpdaterTest.php

@@ -233,46 +233,6 @@ class CronUpdaterTest extends AutomaticUpdatesKernelTestBase {
     ];
   }
 
-  /**
-   * Data provider for testErrors().
-   *
-   * @return array[]
-   *   The test cases for testErrors().
-   */
-  public function providerErrors(): array {
-    $messages = [
-      'PreCreate Event Error',
-      'PreCreate Event Error 2',
-    ];
-    $summary = 'There were errors in updates';
-    $result_no_summary = ValidationResult::createError([$messages[0]]);
-    $result_with_summary = ValidationResult::createError($messages, t($summary));
-    $result_with_summary_message = "<h3>{$summary}</h3><ul><li>{$messages[0]}</li><li>{$messages[1]}</li></ul>";
-
-    return [
-      '1 result with summary' => [
-        [$result_with_summary],
-        $result_with_summary_message,
-      ],
-      '2 results with summary' => [
-        [$result_with_summary, $result_with_summary],
-        "$result_with_summary_message$result_with_summary_message",
-      ],
-      '1 result without summary' => [
-        [$result_no_summary],
-        $messages[0],
-      ],
-      '2 results without summary' => [
-        [$result_no_summary, $result_no_summary],
-        $messages[0] . ' ' . $messages[0],
-      ],
-      '1 result with summary, 1 result without summary' => [
-        [$result_with_summary, $result_no_summary],
-        $result_with_summary_message . ' ' . $messages[0],
-      ],
-    ];
-  }
-
   /**
    * Tests that the stage is destroyed if an error occurs during a cron update.
    *
@@ -305,15 +265,15 @@ class CronUpdaterTest extends AutomaticUpdatesKernelTestBase {
         ValidationResult::createError(['Destroy the stage!']),
       ];
       TestSubscriber1::setTestResult($results, $event_class);
-      $exception = new StageValidationException($results, 'Unable to complete the update because of errors.');
-      $expected_log_message = TestCronUpdater::formatValidationException($exception);
+      $exception = new StageValidationException($results);
     }
     else {
       /** @var \Throwable $exception */
       $exception = new $exception_class('Destroy the stage!');
       TestSubscriber1::setException($exception, $event_class);
-      $expected_log_message = $exception->getMessage();
     }
+    $expected_log_message = $exception->getMessage();
+
     // Ensure that nothing has been logged yet.
     $this->assertEmpty($cron_logger->records);
     $this->assertEmpty($this->logger->records);
@@ -367,21 +327,4 @@ class CronUpdaterTest extends AutomaticUpdatesKernelTestBase {
     }
   }
 
-  /**
-   * Tests errors during a cron update attempt.
-   *
-   * @param \Drupal\package_manager\ValidationResult[] $validation_results
-   *   The expected validation results which should be logged.
-   * @param string $expected_log_message
-   *   The error message should be logged.
-   *
-   * @dataProvider providerErrors
-   */
-  public function testErrors(array $validation_results, string $expected_log_message): void {
-    TestSubscriber1::setTestResult($validation_results, PreCreateEvent::class);
-    $this->container->get('cron')->run();
-    $this->assertUpdateStagedTimes(0);
-    $this->assertTrue($this->logger->hasRecord("<h2>Unable to complete the update because of errors.</h2>$expected_log_message", RfcLogLevel::ERROR));
-  }
-
 }

tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php

@@ -50,9 +50,9 @@ class StagedProjectsValidatorTest extends AutomaticUpdatesKernelTestBase {
       // If we are testing a fixture with existing stage directory then we
       // need to use a virtual file system directory, so we can create a
       // subdirectory using the stage ID after it is created below.
-      $vendor = vfsStream::newDirectory('au_stage');
-      $this->vfsRoot->addChild($vendor);
-      TestStage::$stagingRoot = $vendor->url();
+      $stage_vfs_dir = vfsStream::newDirectory('au_stage');
+      $this->vfsRoot->addChild($stage_vfs_dir);
+      TestStage::$stagingRoot = $stage_vfs_dir->url();
     }
     else {
       // If we are testing non-existent staging directory we can use the path
@@ -66,7 +66,7 @@ class StagedProjectsValidatorTest extends AutomaticUpdatesKernelTestBase {
       // Copy the fixture's staging directory into a subdirectory using the
       // stage ID as the directory name.
       $sub_directory = vfsStream::newDirectory($stage_id);
-      $vendor->addChild($sub_directory);
+      $stage_vfs_dir->addChild($sub_directory);
       (new Filesystem())->mirror($stage_dir, $sub_directory->url());
     }