automatic_updates_extensions/tests/src/Functional/PreUpdateTest.php

@@ -11,7 +11,7 @@ use Drupal\fixture_manipulator\ActiveFixtureManipulator;
  * @group automatic_updates_extensions
  * @internal
  */
-class PreUpdateTest extends UpdaterFormTestBase {
+final class PreUpdateTest extends UpdaterFormTestBase {
 
   /**
    * Tests the form when modules requiring an update not installed via composer.
@@ -48,7 +48,7 @@ class PreUpdateTest extends UpdaterFormTestBase {
 
     // Both of the modules not installed through composer.
     (new ActiveFixtureManipulator())
-      ->removePackage('drupal/semver_test')
+      ->removePackage('drupal/semver_test_package_name')
       ->commitChanges();
     $this->getSession()->reload();
     $assert->pageTextContains('Updates were found, but they must be performed manually. See the list of available updates for more information.');

automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php

@@ -13,7 +13,7 @@ use Drupal\package_manager\ValidationResult;
  * @group automatic_updates_extensions
  * @internal
  */
-class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
+final class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
 
   /**
    * Data provider for testStatusCheckerRunAfterUpdate().
@@ -48,6 +48,7 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
     $assert_session->pageTextNotContains(static::$warningsExplanation);
 
     $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
+    $this->getStageFixtureManipulator()->setVersion('drupal/semver_test_package_name', '8.1.1');
     $this->assertUpdatesCount(1);
     $page->checkField('projects[semver_test]');
     $page->pressButton('Update');
@@ -62,8 +63,7 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
       // We must do this after the update has started, because the pending
       // updates validator will prevent an update from starting.
       $this->container->get('state')->set('automatic_updates_test.new_update', TRUE);
-      $page->pressButton('Continue');
-      $this->checkForMetaRefresh();
+      $this->acceptWarningAndUpdate();
       $assert_session->pageTextContainsOnce('An error has occurred.');
       $assert_session->pageTextContainsOnce('Continue to the error page');
       $page->clickLink('the error page');
@@ -79,23 +79,18 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
       $page->clickLink('Apply pending updates');
       $this->checkForMetaRefresh();
       $assert_session->pageTextContains('Updates were attempted.');
-      // PendingUpdatesValidator prevented the update to complete, so the status
-      // checks weren't run.
-      $this->drupalGet('/admin');
-      $assert_session->pageTextContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
     }
     else {
-      $page->pressButton('Continue');
-      $this->checkForMetaRefresh();
+      $this->acceptWarningAndUpdate();
       $assert_session->addressEquals('/admin/reports/updates');
       $assert_session->pageTextContainsOnce('Update complete!');
-      // Status checks should display errors on admin page.
-      $this->drupalGet('/admin');
-      // Confirm that the status checks were run and the new error is displayed.
-      $assert_session->statusMessageContains('Error before continue.', 'error');
-      $assert_session->statusMessageContains('Your site does not pass some readiness checks for automatic updates. It cannot be automatically updated until further action is performed.', 'error');
-      $assert_session->pageTextNotContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
     }
+    // Status checks should display errors on admin page.
+    $this->drupalGet('/admin');
+    // Confirm that the status checks were run and the new error is displayed.
+    $assert_session->statusMessageContains('Error before continue.', 'error');
+    $assert_session->statusMessageContains('Your site does not pass some readiness checks for automatic updates. It cannot be automatically updated until further action is performed.', 'error');
+    $assert_session->pageTextNotContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
   }
 
 }

automatic_updates_extensions/tests/src/Functional/SuccessfulUpdateTest.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Drupal\Tests\automatic_updates_extensions\Functional;
 
 use Drupal\package_manager\Event\PreApplyEvent;
+use Drupal\package_manager\LegacyVersionUtility;
 use Drupal\package_manager_test_validation\StagedDatabaseUpdateValidator;
 
 /**
@@ -12,7 +13,7 @@ use Drupal\package_manager_test_validation\StagedDatabaseUpdateValidator;
  * @group automatic_updates_extensions
  * @internal
  */
-class SuccessfulUpdateTest extends UpdaterFormTestBase {
+final class SuccessfulUpdateTest extends UpdaterFormTestBase {
 
   /**
    * Data provider for testSuccessfulUpdate().
@@ -23,13 +24,13 @@ class SuccessfulUpdateTest extends UpdaterFormTestBase {
   public function providerSuccessfulUpdate(): array {
     return [
       'maintenance mode on, semver module' => [
-        TRUE, 'semver_test', 'Semver Test', '8.1.0', '8.1.1',
+        TRUE, 'semver_test', 'drupal/semver_test_package_name', 'Semver Test', '8.1.0', '8.1.1',
       ],
       'maintenance mode off, legacy module' => [
-        FALSE, 'aaa_update_test', 'AAA Update test', '8.x-2.0', '8.x-2.1',
+        FALSE, 'aaa_update_test', 'drupal/aaa_update_test', 'AAA Update test', '8.x-2.0', '8.x-2.1',
       ],
       'maintenance mode off, legacy theme' => [
-        FALSE, 'automatic_updates_extensions_test_theme', 'Automatic Updates Extensions Test Theme', '8.x-2.0', '8.x-2.1',
+        FALSE, 'automatic_updates_extensions_test_theme', 'drupal/automatic_updates_extensions_test_theme', 'Automatic Updates Extensions Test Theme', '8.x-2.0', '8.x-2.1',
       ],
     ];
   }
@@ -41,6 +42,8 @@ class SuccessfulUpdateTest extends UpdaterFormTestBase {
    *   Whether maintenance should be on at the beginning of the update.
    * @param string $project_name
    *   The project name.
+   * @param string $package_name
+   *   The package name.
    * @param string $project_title
    *   The project title.
    * @param string $installed_version
@@ -50,7 +53,7 @@ class SuccessfulUpdateTest extends UpdaterFormTestBase {
    *
    * @dataProvider providerSuccessfulUpdate
    */
-  public function testSuccessfulUpdate(bool $maintenance_mode_on, string $project_name, string $project_title, string $installed_version, string $target_version): void {
+  public function testSuccessfulUpdate(bool $maintenance_mode_on, string $project_name, string $package_name, string $project_title, string $installed_version, string $target_version): void {
     $this->container->get('theme_installer')->install(['automatic_updates_theme_with_updates']);
     // By default, the Update module only checks for updates of installed
     // modules and themes. The two modules we're testing here (semver_test and
@@ -60,6 +63,7 @@ class SuccessfulUpdateTest extends UpdaterFormTestBase {
     $path_to_fixtures_folder = $project_name === 'aaa_update_test' ? '/../../../../package_manager/tests' : '/../..';
     $this->setReleaseMetadata(__DIR__ . $path_to_fixtures_folder . '/fixtures/release-history/' . $project_name . '.1.1.xml');
     $this->setProjectInstalledVersion([$project_name => $installed_version]);
+    $this->getStageFixtureManipulator()->setVersion($package_name, LegacyVersionUtility::convertToSemanticVersion($target_version));
     $this->checkForUpdates();
     $state = $this->container->get('state');
     $state->set('system.maintenance_mode', $maintenance_mode_on);
@@ -98,8 +102,7 @@ class SuccessfulUpdateTest extends UpdaterFormTestBase {
     $warning_messages = $assert_session->elementExists('xpath', '//div[@data-drupal-messages]//div[@aria-label="Warning message"]');
     $this->assertStringContainsString('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();
+    $this->acceptWarningAndUpdate();
     $assert_session->addressEquals('/admin/reports/updates');
     // Confirm that the site was in maintenance before the update was applied.
     // @see \Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber::handleEvent()

automatic_updates_extensions/tests/src/Functional/UnsuccessfulUpdateTest.php

@@ -14,7 +14,7 @@ use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
  * @group automatic_updates_extensions
  * @internal
  */
-class UnsuccessfulUpdateTest extends UpdaterFormTestBase {
+final class UnsuccessfulUpdateTest extends UpdaterFormTestBase {
 
   /**
    * Test the form for warning messages.
@@ -31,6 +31,7 @@ class UnsuccessfulUpdateTest extends UpdaterFormTestBase {
     $this->drupalGet('/admin/reports/updates');
     $this->clickLink('Update Extensions');
     $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
+    $this->getStageFixtureManipulator()->setVersion('drupal/semver_test_package_name', '8.1.1');
     $this->assertUpdatesCount(1);
     $this->checkForMetaRefresh();
     $assert->pageTextNotContains(static::$errorsExplanation);
@@ -52,9 +53,9 @@ class UnsuccessfulUpdateTest extends UpdaterFormTestBase {
     $this->getSession()->getPage()->pressButton('Update');
     $this->checkForMetaRefresh();
     $assert->buttonExists('Continue');
-    $assert->pageTextContains($summary_status_check_event);
+    $assert->pageTextContains((string) $summary_status_check_event);
     foreach ($messages_status_check_event as $message) {
-      $assert->pageTextContains($message);
+      $assert->pageTextContains((string) $message);
     }
   }
 

automatic_updates_extensions/tests/src/Functional/UpdateErrorTest.php

@@ -15,7 +15,7 @@ use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
  * @group automatic_updates_extensions
  * @internal
  */
-class UpdateErrorTest extends UpdaterFormTestBase {
+final class UpdateErrorTest extends UpdaterFormTestBase {
 
   /**
    * Tests that an exception is thrown if a previous apply failed.
@@ -32,6 +32,7 @@ class UpdateErrorTest extends UpdaterFormTestBase {
     $assert_session->pageTextNotContains(static::$warningsExplanation);
 
     $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
+    $this->getStageFixtureManipulator()->setVersion('drupal/semver_test_package_name', '8.1.1');
     $this->assertUpdatesCount(1);
     $page->checkField('projects[semver_test]');
     $page->pressButton('Update');
@@ -39,8 +40,7 @@ class UpdateErrorTest extends UpdaterFormTestBase {
     $this->assertUpdateStagedTimes(1);
     $assert_session->pageTextNotContains('The following dependencies will also be updated:');
     LoggingCommitter::setException(new \Exception('failed at committer'));
-    $page->pressButton('Continue');
-    $this->checkForMetaRefresh();
+    $this->acceptWarningAndUpdate();
     $failure_message = 'Automatic updates failed to apply, and the site is in an indeterminate state. Consider restoring the code and database from a backup.';
     $assert_session->pageTextContainsOnce('An error has occurred.');
     $assert_session->pageTextContains($failure_message);
@@ -78,7 +78,7 @@ class UpdateErrorTest extends UpdaterFormTestBase {
     $error = ValidationResult::createError([$message]);
     TestSubscriber1::setTestResult([$error], StatusCheckEvent::class);
     $this->getSession()->reload();
-    $assert->pageTextContains($message);
+    $assert->pageTextContains((string) $message);
     $assert->pageTextContains(static::$errorsExplanation);
     $assert->pageTextNotContains(static::$warningsExplanation);
     $assert->buttonNotExists('Update');
@@ -111,9 +111,9 @@ class UpdateErrorTest extends UpdaterFormTestBase {
     $this->checkForMetaRefresh();
     $assert->pageTextContains(static::$errorsExplanation);
     $assert->pageTextNotContains(static::$warningsExplanation);
-    $assert->pageTextContains($summary);
+    $assert->pageTextContains((string) $summary);
     foreach ($messages as $message) {
-      $assert->pageTextContains($message);
+      $assert->pageTextContains((string) $message);
     }
     $assert->buttonNotExists('Continue');
   }

automatic_updates_extensions/tests/src/Functional/UpdaterFormTestBase.php

@@ -13,6 +13,8 @@ use Drupal\Tests\automatic_updates\Functional\UpdaterFormTestBase as UpdaterForm
  * Base class for functional tests of updater form.
  *
  * @internal
+ *   This class is an internal part of the module's testing infrastructure and
+ *   should not be used by external code.
  */
 abstract class UpdaterFormTestBase extends UpdaterFormFunctionalTestBase {
 
@@ -48,11 +50,19 @@ abstract class UpdaterFormTestBase extends UpdaterFormFunctionalTestBase {
 
     $this->activeDir = $this->container->get(PathLocator::class)->getProjectRoot();
     (new ActiveFixtureManipulator())
-      ->addPackage([
-        'name' => 'drupal/semver_test',
-        'version' => '8.1.0',
-        'type' => 'drupal-module',
-      ])
+      // Add a package where the Composer package name,
+      // drupal/semver_test_package_name, does not match the project name,
+      // semver_test.
+      ->addPackage(
+        [
+          'name' => 'drupal/semver_test_package_name',
+          'version' => '8.1.0',
+          'type' => 'drupal-module',
+        ],
+        extra_files: [
+          'semver_test.info.yml' => '{name: "Semver Test", project: "semver_test", type: "module"}',
+        ]
+      )
       ->addPackage([
         'name' => 'drupal/aaa_update_test',
         'version' => '2.0.0',
@@ -129,4 +139,16 @@ abstract class UpdaterFormTestBase extends UpdaterFormFunctionalTestBase {
     $this->checkForMetaRefresh();
   }
 
+  /**
+   * Continue the update after checking the backup warning checkbox.
+   */
+  protected function acceptWarningAndUpdate(): void {
+    $page = $this->getSession()->getPage();
+    $page->pressButton('Continue');
+    $this->assertSession()->statusMessageContains('Warning: Updating contributed modules or themes may leave your site inoperable or looking wrong. field is required.', 'error');
+    $page->checkField('backup');
+    $page->pressButton('Continue');
+    $this->checkForMetaRefresh();
+  }
+
 }

automatic_updates_extensions/tests/src/Kernel/AutomaticUpdatesExtensionsKernelTestBase.php

@@ -4,15 +4,19 @@ declare(strict_types = 1);
 
 namespace Drupal\Tests\automatic_updates_extensions\Kernel;
 
+use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
 use Drupal\fixture_manipulator\ActiveFixtureManipulator;
 use Drupal\package_manager\Event\PreOperationStageEvent;
 use Drupal\package_manager\Exception\StageEventException;
+use Drupal\package_manager\Validator\ComposerValidator;
 use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
 
 /**
  * Base class for kernel tests of the Automatic Updates Extensions module.
  *
  * @internal
+ *   This class is an internal part of the module's testing infrastructure and
+ *   should not be used by external code.
  */
 abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdatesKernelTestBase {
 
@@ -33,7 +37,7 @@ abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdates
     // server. This should be okay in most situations because, apart from the
     // validator, only Composer Stager needs run Composer, and
     // package_manager_bypass is disabling those operations.
-    $this->disableValidators[] = 'package_manager.validator.composer';
+    $this->disableValidators[] = ComposerValidator::class;
     parent::setUp();
     // Install additional packages that will be needed in tests.
     (new ActiveFixtureManipulator())
@@ -54,7 +58,7 @@ abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdates
       ], TRUE)
       ->addPackage([
         "name" => "drupal/semver_test",
-        "version" => "1.0.0",
+        "version" => "8.1.0",
         "type" => "drupal-module",
       ])
       ->addPackage([
@@ -81,7 +85,7 @@ abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdates
    *   be passed if $expected_results is not empty.
    */
   protected function assertUpdateResults(array $project_versions, array $expected_results, string $event_class = NULL): void {
-    $stage = $this->container->get('automatic_updates_extensions.update_stage');
+    $stage = $this->container->get(ExtensionUpdateStage::class);
 
     try {
       $stage->begin($project_versions);

automatic_updates_extensions/tests/src/Kernel/ExtensionUpdateStageTest.php

@@ -5,14 +5,16 @@ declare(strict_types = 1);
 namespace Drupal\Tests\automatic_updates_extensions\Kernel;
 
 use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
+use Drupal\automatic_updates_extensions\Validator\UpdateReleaseValidator;
 use Drupal\Tests\user\Traits\UserCreationTrait;
+use PhpTuf\ComposerStager\API\Core\StagerInterface;
 
 /**
  * @coversDefaultClass \Drupal\automatic_updates_extensions\ExtensionUpdateStage
  * @group automatic_updates_extensions
  * @internal
  */
-class ExtensionUpdateStageTest extends AutomaticUpdatesExtensionsKernelTestBase {
+final class ExtensionUpdateStageTest extends AutomaticUpdatesExtensionsKernelTestBase {
 
   use UserCreationTrait;
 
@@ -33,7 +35,7 @@ class ExtensionUpdateStageTest extends AutomaticUpdatesExtensionsKernelTestBase
     // This test doesn't need to validate that the test projects used are in the
     // codebase. Therefore, we need to disable the following validators that
     // require real Drupal projects.
-    $this->disableValidators[] = 'automatic_updates_extensions.validator.target_release';
+    $this->disableValidators[] = UpdateReleaseValidator::class;
     parent::setUp();
     $this->installEntitySchema('user');
 
@@ -98,13 +100,14 @@ class ExtensionUpdateStageTest extends AutomaticUpdatesExtensionsKernelTestBase
       [
         'update',
         '--with-all-dependencies',
+        '--optimize-autoloader',
         'drupal/my_module:9.8.1',
         'drupal/my_dev_module:1.2.0-alpha1@alpha',
       ],
     ];
     $stage->stage();
 
-    $actual_arguments = $this->container->get('package_manager.stager')
+    $actual_arguments = $this->container->get(StagerInterface::class)
       ->getInvocationArguments();
 
     $this->assertCount(count($expected_arguments), $actual_arguments);

automatic_updates_extensions/tests/src/Kernel/Validator/ForbidCoreChangesValidatorTest.php

+<?php
+
+namespace Drupal\Tests\automatic_updates_extensions\Kernel\Validator;
+
+use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
+use Drupal\package_manager\Exception\StageEventException;
+use Drupal\package_manager\ValidationResult;
+use Drupal\Tests\automatic_updates_extensions\Kernel\AutomaticUpdatesExtensionsKernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\automatic_updates_extensions\Validator\ForbidCoreChangesValidator
+ * @group automatic_updates_extensions
+ * @internal
+ */
+class ForbidCoreChangesValidatorTest extends AutomaticUpdatesExtensionsKernelTestBase {
+
+  /**
+   * Tests error messages if requested updates were not staged.
+   *
+   * @param array $staged_versions
+   *   An array of the staged versions where the keys are the package names and
+   *   the values are the package versions or NULL if the package should be
+   *   removed in the stage.
+   * @param string[][] $new_packages
+   *   An array of the new packages to add to the stage.
+   * @param \Drupal\package_manager\ValidationResult[] $expected_results
+   *   The expected validation results.
+   *
+   * @dataProvider providerTestErrorMessage
+   */
+  public function testErrorMessages(array $staged_versions, array $new_packages, array $expected_results): void {
+    $this->setReleaseMetadata([
+      'semver_test' => __DIR__ . '/../../../fixtures/release-history/semver_test.1.1.xml',
+      'drupal' => __DIR__ . '/../../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml',
+    ]);
+    $this->getStageFixtureManipulator()->addPackage([
+      'name' => 'drupal/non-core',
+      'version' => '1.0.0',
+      'type' => 'package',
+    ]);
+
+    foreach ($staged_versions as $package => $version) {
+      if ($version === NULL) {
+        $this->getStageFixtureManipulator()->removePackage($package);
+        continue;
+      }
+      $this->getStageFixtureManipulator()->setVersion($package, $version);
+    }
+    foreach ($new_packages as $package) {
+      $this->getStageFixtureManipulator()->addPackage($package);
+    }
+    $this->getStageFixtureManipulator()->setVersion('drupal/semver_test', '8.1.1');
+
+    $stage = $this->container->get(ExtensionUpdateStage::class);
+    $stage->begin([
+      'semver_test' => '8.1.1',
+    ]);
+    $stage->stage();
+    $this->assertStatusCheckResults($expected_results, $stage);
+    try {
+      $stage->apply();
+      $this->fail('Expecting an exception.');
+    }
+    catch (StageEventException $exception) {
+      $this->assertExpectedResultsFromException($expected_results, $exception);
+    }
+  }
+
+  /**
+   * Data provider for testErrorMessage().
+   *
+   * @return mixed[]
+   *   The test cases.
+   */
+  public function providerTestErrorMessage(): array {
+    $summary = t('Updating Drupal Core while updating extensions is currently not supported. Use <a href="/admin/reports/updates/update">this form</a> to update Drupal core. The following changes were made to the Drupal core packages:');
+    return [
+      'drupal/core updated, non-core updated' => [
+        [
+          'drupal/core' => '9.8.1',
+          'drupal/non-core' => '1.0.1',
+        ],
+        [],
+        [ValidationResult::createError([t("'drupal/core' version changed from 9.8.0 to 9.8.1.")], $summary)],
+      ],
+      'drupal/core-recommended and drupal/core updated, non-core package installed' => [
+        [
+          'drupal/core-recommended' => '9.8.1',
+          'drupal/core' => '9.8.1',
+        ],
+        [
+          [
+            'name' => 'other-org/other-package',
+            'type' => 'package',
+          ],
+        ],
+        [
+          ValidationResult::createError(
+            [
+              t("'drupal/core-recommended' version changed from 9.8.0 to 9.8.1."),
+              t("'drupal/core' version changed from 9.8.0 to 9.8.1."),
+            ],
+            $summary
+          ),
+        ],
+      ],
+      'drupal/core-recommended removed, drupal/core updated, drupal/core-composer-scaffold installed, non-core package removed' => [
+        [
+          'drupal/core-recommended' => NULL,
+          'drupal/core' => '9.8.1',
+          'drupal/non-core' => NULL,
+        ],
+        [
+          [
+            'name' => 'drupal/core-composer-scaffold',
+            'type' => 'package',
+          ],
+        ],
+        [
+          ValidationResult::createError(
+            [
+              t("'drupal/core-composer-scaffold' installed."),
+              t("'drupal/core-recommended' removed."),
+              t("'drupal/core' version changed from 9.8.0 to 9.8.1."),
+            ],
+            $summary
+          ),
+        ],
+      ],
+    ];
+  }
+
+}

automatic_updates_extensions/tests/src/Kernel/Validator/RequestedUpdateValidatorTest.php

+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\Tests\automatic_updates_extensions\Kernel\Validator;
+
+use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
+use Drupal\fixture_manipulator\ActiveFixtureManipulator;
+use Drupal\package_manager\Exception\StageEventException;
+use Drupal\package_manager\ValidationResult;
+use Drupal\Tests\automatic_updates_extensions\Kernel\AutomaticUpdatesExtensionsKernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\automatic_updates_extensions\Validator\RequestedUpdateValidator
+ * @group automatic_updates_extensions
+ * @internal
+ */
+class RequestedUpdateValidatorTest extends AutomaticUpdatesExtensionsKernelTestBase {
+
+  /**
+   * Tests error messages if requested updates were not staged.
+   *
+   * @param array $staged_versions
+   *   An array of the staged versions where the keys are the package names and
+   *   the values are the package versions.
+   * @param array $expected_results
+   *   The expected validation results.
+   *
+   * @dataProvider providerTestErrorMessage
+   */
+  public function testErrorMessage(array $staged_versions, array $expected_results): void {
+    if ($staged_versions) {
+      // If we are going to stage updates to Drupal packages also update a
+      // non-Drupal. The validator should ignore the non-Drupal packages.
+      (new ActiveFixtureManipulator())
+        ->addPackage([
+          "name" => 'vendor/non-drupal-package',
+          "version" => "1.0.0",
+          "type" => "drupal-module",
+        ])
+        ->commitChanges();
+      $this->getStageFixtureManipulator()->setVersion('vendor/non-drupal-package', '1.0.1');
+      foreach ($staged_versions as $package => $version) {
+        $this->getStageFixtureManipulator()->setVersion($package, $version);
+      }
+    }
+
+    $this->setReleaseMetadata([
+      'semver_test' => __DIR__ . '/../../../fixtures/release-history/semver_test.1.1.xml',
+      'drupal' => __DIR__ . '/../../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml',
+      'aaa_update_test' => __DIR__ . "/../../../../../package_manager/tests/fixtures/release-history/aaa_update_test.1.1.xml",
+    ]);
+    // Set the project version to '8.0.1' so that there 2 versions of above this
+    // that will be in the list of supported releases, 8.1.0 and 8.1.1.
+    (new ActiveFixtureManipulator())
+      ->setVersion('drupal/semver_test', '8.0.1')
+      ->commitChanges();
+    // @todo Replace with use of the trait from the Update module in https://drupal.org/i/3348234.
+    $module_info = ['version' => '8.0.1', 'project' => 'semver_test'];
+    $this->config('update_test.settings')
+      ->set("system_info.semver_test", $module_info)
+      ->save();
+
+    $stage = $this->container->get(ExtensionUpdateStage::class);
+    $stage->begin([
+      'semver_test' => '8.1.1',
+      'aaa_update_test' => '8.x-1.1',
+    ]);
+    $stage->stage();
+    $this->assertStatusCheckResults($expected_results, $stage);
+    try {
+      $stage->apply();
+      $this->fail('Expecting an exception.');
+    }
+    catch (StageEventException $exception) {
+      $this->assertExpectedResultsFromException($expected_results, $exception);
+    }
+  }
+
+  /**
+   * Data provider for testErrorMessage().
+   *
+   * @return mixed[]
+   *   The test cases.
+   */
+  public function providerTestErrorMessage() {
+    return [
+      'no updates' => [
+        [],
+        [
+          ValidationResult::createError([t('No updates detected in the staging area.')]),
+        ],
+      ],
+      '1 project not updated' => [
+        [
+          'drupal/aaa_update_test' => '1.1.0',
+        ],
+        [
+          ValidationResult::createError([t("The requested update to 'drupal/semver_test' to version '8.1.1' was not performed.")]),
+        ],
+      ],
+      'project updated to wrong version' => [
+        [
+          'drupal/semver_test' => '8.1.0',
+          'drupal/aaa_update_test' => '1.1.0',
+        ],
+        [
+          ValidationResult::createError([t("The requested update to 'drupal/semver_test' to version '8.1.1' does not match the actual staged update to '8.1.0'.")]),
+        ],
+      ],
+    ];
+  }
+
+}

automatic_updates_extensions/tests/src/Kernel/Validator/UpdateReleaseValidatorTest.php

@@ -14,7 +14,7 @@ use Drupal\Tests\automatic_updates_extensions\Kernel\AutomaticUpdatesExtensionsK
  * @group automatic_updates_extensions
  * @internal
  */
-class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBase {
+final class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBase {
 
   /**
    * {@inheritdoc}
@@ -79,6 +79,9 @@ class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBas
       ];
     }
     else {
+      // Ensure the correct version of the package is staged because the update
+      // is expected to succeed.
+      $this->getStageFixtureManipulator()->setVersion("drupal/$project", LegacyVersionUtility::convertToSemanticVersion($target_version));
       $expected_results = [];
     }
 

automatic_updates_extensions/tests/src/Traits/FormTestTrait.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\automatic_updates_extensions\Traits;
 
@@ -11,6 +11,8 @@ use Drupal\Tests\BrowserTestBase;
  * Common methods for testing the update form.
  *
  * @internal
+ *   This class is an internal part of the module's testing infrastructure and
+ *   should not be used by external code.
  */
 trait FormTestTrait {
 
@@ -32,7 +34,10 @@ trait FormTestTrait {
     $row_selector = ".update-recommended tr:nth-of-type($row)";
     $assert->elementTextContains('css', $row_selector . ' td:nth-of-type(2)', $expected_project_title);
     $assert->elementTextContains('css', $row_selector . ' td:nth-of-type(3)', $expected_installed_version);
-    $assert->elementTextContains('css', $row_selector . ' td:nth-of-type(4)', $expected_target_version);
+    $target_selector = $row_selector . ' td:nth-of-type(4)';
+    $cell = $assert->elementExists('css', $target_selector);
+    $link_url = $assert->elementExists('named', ['link', 'Release notes'], $cell)->getAttribute('href');
+    $this->assertStringContainsString(str_replace('.', '-', $expected_target_version) . '-release', $link_url);
   }
 
   /**

composer.json

@@ -14,7 +14,7 @@
     },
     "require": {
         "ext-json": "*",
-        "php-tuf/composer-stager": "2.0-alpha4",
+        "php-tuf/composer-stager": "2.0-beta3",
         "composer-runtime-api": "^2.1",
         "symfony/console": "^6.2"
     },
@@ -29,14 +29,14 @@
             "Composer\\Config::disableProcessTimeout",
             "scripts/phpunit.sh"
         ],
-        "core-convert": "Drupal\\automatic_updates\\Development\\Converter::doConvert",
-        "core-commit": "Drupal\\automatic_updates\\Development\\Converter::makeCommit"
+        "core-convert": "Drupal\\automatic_updates\\Development\\ConverterCommand",
+        "core-commit": "Drupal\\automatic_updates\\Development\\ConverterCommand::makeCommit"
     },
     "scripts-descriptions": {
         "phpcbf": "Automatically fixes standards violations where possible.",
         "phpcs": "Checks code for standards compliance.",
         "test": "Runs PHPUnit tests.",
-        "core-convert": "Converts this module to a core merge request. Excepts 2 arguments. 1) The core clone directory. 2) The core merge request branch.",
+        "core-convert": "Converts this module to a core merge request. For arguments and options see \\Drupal\\automatic_updates\\Development\\ConverterCommand::configure().",
         "core-commit": "Converts this module to a core merge request. Excepts 1 arguments. The core clone directory."
     },
     "autoload": {

config/schema/automatic_updates.schema.yml

@@ -26,4 +26,4 @@ automatic_updates.settings:
       label: 'Allow minor level Drupal core updates'
     status_check_mail:
       type: string
-      label: 'Whether to send status check failure e-mail notifications during cron'
+      label: 'Whether to send status check failure email notifications during cron'

dictionary.txt

@@ -11,3 +11,6 @@ filedate
 unshallow
 hhvm
 proc_open
+bootable
+Syncer
+gitlabci

drupalci.yml

-# https://www.drupal.org/drupalorg/docs/drupal-ci/customizing-drupalci-testing
-# Copied from https://git.drupalcode.org/project/ckeditor5/-/blob/c68be57fbc2c29969e9726ec932af3f0e80c3dd9/drupalci.yml
-# cspell:disable
-build:
-  assessment:
-    # validate_codebase:
-    # automatic_updates code quality checking matches that of Drupal core: it is checked by container_command.commit_checks.
-    testing:
-      # Run code quality checks.
-      container_command.commit-checks:
-        commands:
-          # Install rsync.
-          - DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y rsync
-          # Update to latest Composer.
-          - composer self-update
-          # @todo Replace in favor of commit-code-check.sh once https://www.drupal.org/project/drupal/issues/3314100 lands.
-          - modules/contrib/automatic_updates/scripts/commit-code-check.sh --drupalci
-        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.
-      # suppress-deprecations is false in order to be alerted to usages of
-      # deprecated code.
-      run_tests.phpunit:
-        types: 'PHPUnit-Unit'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.kernel:
-        types: 'PHPUnit-Kernel'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.build:
-        # Limit concurrency due to disk space concerns.
-        concurrency: 15
-        types: 'PHPUnit-Build'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.functional:
-        types: 'PHPUnit-Functional'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      # Functional JavaScript tests require a concurrency of 1 because there is
-      # only one instance of PhantomJS on the testbot machine.
-      run_tests.javascript:
-        concurrency: 1
-        types: 'PHPUnit-FunctionalJavascript'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false

package_manager/config/install/package_manager.settings.yml

@@ -5,3 +5,4 @@ executables:
   composer: ~
   rsync: ~
 additional_trusted_composer_plugins: []
+include_unknown_files_in_project_root: false

package_manager/config/schema/package_manager.schema.yml

@@ -4,7 +4,7 @@ package_name:
   constraints:
     Regex:
       # @see https://getcomposer.org/schema.json
-      pattern: '/^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]|-{1,2})?[a-z0-9]+)*$/'
+      pattern: '/^[a-z0-9]([_.-]?[a-z0-9]+)*\/[a-z0-9](([_.]|-{1,2})?[a-z0-9]+)*$/'
 
 package_manager.settings:
   type: config_object
@@ -25,3 +25,6 @@ package_manager.settings:
       sequence:
         type: package_name
         label: 'Trusted composer plugin'
+    include_unknown_files_in_project_root:
+      type: boolean
+      label: 'Include unrecognized files and directories in the project root in staging operations'

package_manager/package_manager.api.php

@@ -97,17 +97,16 @@
  *
  * - \Drupal\package_manager\Event\PostApplyEvent
  *   Dispatched after changes in the stage directory have been copied to the
- *   active directory. This event may be dispatched multiple times during the
- *   stage life cycle.
- *
- * - \Drupal\package_manager\Event\PreDestroyEvent
- *   Dispatched before the stage directory is deleted and the stage releases its
- *   ownership. This event is dispatched only once during the stage life cycle.
- *
- * - \Drupal\package_manager\Event\PostDestroyEvent
- *   Dispatched after the stage directory is deleted and the stage has released
- *   its ownership. This event is dispatched only once during the stage life
- *   cycle.
+ *   active directory. It should only be used for cleaning up after other
+ *   operations that happened during the stage life cycle. For example, a
+ *   PostCreateEvent subscriber might have set a state value which is no longer
+ *   needed once the stage has been applied to the active directory -- in such a
+ *   case, a PostApplyEvent subscriber should delete that value.
+ *   `drupal_flush_all_caches()` is called just before this event is dispatched,
+ *   so subscribers shouldn't need to flush any caches or rebuild the service
+ *   container. This event may be dispatched multiple times during the stage
+ *   life cycle, and should *never* be used for schema changes (i.e., operations
+ *   that should happen in `hook_update_N()` or a post-update function).
  *
  * @section sec_stage_api Stage API: Public methods
  * The public API of any stage consists of the following methods:
@@ -140,9 +139,9 @@
  *   be claimed by its owner to call this method.
  *
  * - \Drupal\package_manager\StageBase::destroy()
- *   Destroys the stage directory, releases ownership, and dispatches pre- and
- *   post-destroy events. It is possible to destroy the stage without having
- *   claimed it first, but this shouldn't be done unless absolutely necessary.
+ *   Destroys the stage directory, and releases ownership. It is possible to
+ *   destroy the stage without having claimed it first, but this shouldn't be
+ *   done unless absolutely necessary.
  *
  * - \Drupal\package_manager\StageBase::stageDirectoryExists()
  *   Determines if the stage directory exists and returns a boolean accordingly.

package_manager/package_manager.info.yml

 name: 'Package Manager'
 type: module
 description: 'API module providing functionality to stage package installs and updates with Composer.'
-core_version_requirement: ^10
+core_version_requirement: ^10.1
 dependencies:
   - drupal:update