diff --git a/automatic_updates.module b/automatic_updates.module
index 37b95909b2919d7392f1ab12caebb560653074bd..716cd7c9d6128fee42b88814f5f177d7015d9838 100644
--- a/automatic_updates.module
+++ b/automatic_updates.module
@@ -127,10 +127,7 @@ function automatic_updates_page_top() {
// @todo Rely on the route option after https://www.drupal.org/i/3236497 is
// committed.
- // @todo Remove 'system.batch_page.html' after
- // https://www.drupal.org/i/3238311 is committed.
$skip_routes = [
- 'system.batch_page.html',
'automatic_updates.confirmation_page',
'automatic_updates.report_update',
'automatic_updates.module_update',
@@ -166,7 +163,7 @@ function automatic_updates_module_implements_alter(&$implementations, $hook) {
* Implements hook_cron().
*/
function automatic_updates_cron() {
- // @todo Refactor this after https://www.drupal.org/project/drupal/issues/2969056
+ // @todo Refactor this after https://www.drupal.org/project/drupal/issues/2538292
// @todo Remove this after https://www.drupal.org/project/drupal/issues/3318964
if (defined('MAINTENANCE_MODE') || stripos($_SERVER['PHP_SELF'], 'update.php') !== FALSE) {
return;
diff --git a/automatic_updates_extensions/src/Validator/UpdateReleaseValidator.php b/automatic_updates_extensions/src/Validator/UpdateReleaseValidator.php
index f3cb1ab4fe0303dbecb804467e4630e6cab0aa12..24c90715df61449b2a3be58ba309833222cb2bdc 100644
--- a/automatic_updates_extensions/src/Validator/UpdateReleaseValidator.php
+++ b/automatic_updates_extensions/src/Validator/UpdateReleaseValidator.php
@@ -20,7 +20,8 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
* This class is an internal part of the module's update handling and
* should not be used by external code.
*
- * @todo Remove this validator completely in https://www.drupal.org/i/3307369.
+ * @todo Decide if this validator can be removed completely in
+ * https://www.drupal.org/i/3351091.
*/
final class UpdateReleaseValidator implements EventSubscriberInterface {
diff --git a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTestBase.php b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTestBase.php
index 42e14f315844cebe9fa81cb78cd7013121fafcfa..c20f1027d604a7ead1064646f1e002aa5e127cc1 100644
--- a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTestBase.php
+++ b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTestBase.php
@@ -65,8 +65,8 @@ abstract class UpdaterFormTestBase extends UpdaterFormFunctionalTestBase {
/**
* Sets installed project version.
*
- * @todo This is copied from core. We need to file a core issue so we do not
- * have to copy this.
+ * @todo Remove this function with use of the trait from the Update module in
+ * https://drupal.org/i/3348234.
*/
protected function setProjectInstalledVersion($project_versions): void {
$this->config('update.settings')
diff --git a/automatic_updates_extensions/tests/src/Kernel/Validator/UpdateReleaseValidatorTest.php b/automatic_updates_extensions/tests/src/Kernel/Validator/UpdateReleaseValidatorTest.php
index b59e6f3286e6fcf1a0a03168fe163ebf191ae608..4ff92ffd7c6f1d6a9543f8fda25e4a7dc0439bdd 100644
--- a/automatic_updates_extensions/tests/src/Kernel/Validator/UpdateReleaseValidatorTest.php
+++ b/automatic_updates_extensions/tests/src/Kernel/Validator/UpdateReleaseValidatorTest.php
@@ -53,6 +53,7 @@ class UpdateReleaseValidatorTest extends AutomaticUpdatesExtensionsKernelTestBas
public function testPreCreateException(string $project, string $installed_version, string $target_version, bool $error_expected): void {
$this->enableModules([$project]);
+ // @todo Replace with use of the trait from the Update module in https://drupal.org/i/3348234.
$module_info = ['version' => $installed_version, 'project' => $project];
$this->config('update_test.settings')
->set("system_info.$project", $module_info)
diff --git a/package_manager/core_packages.yml b/package_manager/core_packages.yml
deleted file mode 100644
index d3b8151a19a45e71c40395c7f9033d9d04efdb41..0000000000000000000000000000000000000000
--- a/package_manager/core_packages.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file exists so that \Drupal\package_manager\InstalledPackagesList knows
-# which installed packages are considered part of Drupal core. There's no way
-# to tell by package type alone, since these packages have varying types, but
-# are all part of Drupal core's repository. This file is for internal use and
-# may be changed or removed at any time. Code external to Package Manager
-# should not use it in any way.
-[
- drupal/core,
- drupal/core-composer-scaffold,
- drupal/core-dev,
- drupal/core-dev-pinned,
- drupal/core-project-message,
- drupal/core-recommended,
- drupal/core-vendor-hardening
-]
diff --git a/package_manager/src/ComposerInspector.php b/package_manager/src/ComposerInspector.php
index 602e871645ef36f39f96a60f1ce4935853abe699..72592bd5d1bab7bcfb9783e087f764f2f730f60d 100644
--- a/package_manager/src/ComposerInspector.php
+++ b/package_manager/src/ComposerInspector.php
@@ -258,7 +258,7 @@ class ComposerInspector implements LoggerAwareInterface {
catch (RuntimeException $e) {
// Assume any error from `composer config` is about an undefined key-value
// pair which may have a known default value.
- // @todo Remove this once https://github.com/composer/composer/issues/11302 lands and ships in a composer release.
+ // @todo Remove this in https://www.drupal.org/i/3350568.
switch ($key) {
// @see https://getcomposer.org/doc/04-schema.md#minimum-stability
case 'minimum-stability':
diff --git a/package_manager/src/InstalledPackagesList.php b/package_manager/src/InstalledPackagesList.php
index fccfcc0cb356b520388e979687fa02b51129fb1f..abd7628cf9b899b9ee4c6fb5d214578e0548aa89 100644
--- a/package_manager/src/InstalledPackagesList.php
+++ b/package_manager/src/InstalledPackagesList.php
@@ -5,7 +5,6 @@ declare(strict_types = 1);
namespace Drupal\package_manager;
use Composer\Semver\Comparator;
-use Drupal\Component\Serialization\Yaml;
/**
* Defines a class to list installed Composer packages.
@@ -134,21 +133,22 @@ final class InstalledPackagesList extends \ArrayObject {
* Returns the canonical names of the supported core packages.
*
* @return string[]
- * The canonical list of supported core package names, as listed in
- * ../core_packages.json.
+ * The canonical list of supported core package names.
*/
private static function getCorePackageList(): array {
- if (self::$corePackages === NULL) {
- $file = __DIR__ . '/../core_packages.yml';
- assert(file_exists($file), "$file does not exist.");
-
- $core_packages = file_get_contents($file);
- $core_packages = Yaml::decode($core_packages);
-
- assert(is_array($core_packages), "$file did not contain a list of core packages.");
- self::$corePackages = $core_packages;
- }
- return self::$corePackages;
+ // This method returns the installed packages that are considered part of
+ // Drupal core. There's no way to tell by package type alone, since these
+ // packages have varying types, but are all part of Drupal core's
+ // repository.
+ return [
+ 'drupal/core',
+ 'drupal/core-composer-scaffold',
+ 'drupal/core-dev',
+ 'drupal/core-dev-pinned',
+ 'drupal/core-project-message',
+ 'drupal/core-recommended',
+ 'drupal/core-vendor-hardening',
+ ];
}
/**
diff --git a/package_manager/src/PackageManagerServiceProvider.php b/package_manager/src/PackageManagerServiceProvider.php
index 769060f12fd96bc2cd6371883a7c41940f3f654e..d6b5b8f0559e18290073579520a0adef3bdb9eaf 100644
--- a/package_manager/src/PackageManagerServiceProvider.php
+++ b/package_manager/src/PackageManagerServiceProvider.php
@@ -15,7 +15,7 @@ use PhpTuf\ComposerStager\Domain\Service\Precondition\NoSymlinksPointToADirector
* Scans the Composer Stager library and registers its classes in the Drupal
* service container.
*
- * @todo Refactor this if/when symfony/config becomes a dependency: revert https://www.drupal.org/i/3345039.
+ * @todo Refactor this if/when https://www.drupal.org/i/3111008 is fixed.
*
* @internal
* This is an internal part of Package Manager and may be changed or removed
diff --git a/package_manager/src/Validator/OverwriteExistingPackagesValidator.php b/package_manager/src/Validator/OverwriteExistingPackagesValidator.php
index eba2ec5e923a1b31cf301736f2de760ba98b59e4..f5f38e7c9830f967a5e012a3c192ae8896159ce3 100644
--- a/package_manager/src/Validator/OverwriteExistingPackagesValidator.php
+++ b/package_manager/src/Validator/OverwriteExistingPackagesValidator.php
@@ -58,9 +58,7 @@ final class OverwriteExistingPackagesValidator implements EventSubscriberInterfa
->getPackagesNotIn($active_packages);
foreach ($new_packages as $package) {
- // @todo Remove the check for the `metapackage` type in
- // https://drupal.org/i/3345646.
- if (empty($package->path) || $package->type === 'metapackage') {
+ if (empty($package->path)) {
// Packages without a `path` cannot overwrite existing directories.
continue;
}
diff --git a/package_manager/src/Validator/StagedDBUpdateValidator.php b/package_manager/src/Validator/StagedDBUpdateValidator.php
index 79545027c3291a33e19909c081e428ab15768f00..7b2a56094abf5db8a675cb81ac6c4c7f5d85d3b1 100644
--- a/package_manager/src/Validator/StagedDBUpdateValidator.php
+++ b/package_manager/src/Validator/StagedDBUpdateValidator.php
@@ -74,17 +74,16 @@ class StagedDBUpdateValidator implements EventSubscriberInterface {
* TRUE if the staged copy of the extension has changed update functions
* compared to the active copy, FALSE otherwise.
*
- * @todo Use a more sophisticated method to detect changes in the staged
- * extension. Right now, we just compare hashes of the .install and
- * .post_update.php files in both copies of the given extension, but this
- * will cause false positives for changes to comments, whitespace, or
- * runtime code like requirements checks. It would be preferable to use a
- * static analyzer to detect new or changed functions that are actually
- * executed during an update. No matter what, this method must NEVER cause
- * false negatives, since that could result in code which is incompatible
- * with the current database schema being copied to the active directory.
- *
- * @see https://www.drupal.org/project/automatic_updates/issues/3253828
+ * @todo In https://drupal.org/i/3253828 use a more sophisticated method to
+ * detect changes in the staged extension. Right now, we just compare hashes
+ * of the .install and .post_update.php files in both copies of the given
+ * extension, but this will cause false positives for changes to comments,
+ * whitespace, or runtime code like requirements checks. It would be
+ * preferable to use a static analyzer to detect new or changed functions
+ * that are actually executed during an update. No matter what, this method
+ * must NEVER cause false negatives, since that could result in code which
+ * is incompatible with the current database schema being copied to the
+ * active directory.
*/
public function hasStagedUpdates(string $stage_dir, Extension $extension): bool {
$active_dir = $this->pathLocator->getProjectRoot();
diff --git a/package_manager/src/Validator/SymlinkValidator.php b/package_manager/src/Validator/SymlinkValidator.php
index 23a6d8d86007834a0b7ca5dd8acd1ace1b845f45..84e14fc3b1aa39a05af1bada1128505760d09ec1 100644
--- a/package_manager/src/Validator/SymlinkValidator.php
+++ b/package_manager/src/Validator/SymlinkValidator.php
@@ -13,7 +13,7 @@ use PhpTuf\ComposerStager\Infrastructure\Value\PathList\PathList;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
- * Flags errors if any unsupported symlinks exist.
+ * Flags errors if unsupported symbolic links are detected.
*
* @see https://github.com/php-tuf/composer-stager/tree/develop/src/Domain/Service/Precondition#symlinks
*
diff --git a/package_manager/src/Validator/WritableFileSystemValidator.php b/package_manager/src/Validator/WritableFileSystemValidator.php
index ac1f301680c09bebd9410d2dd42dedf6e41d06f0..9858f741484f840bed53c3715162d8b70d7eb9da 100644
--- a/package_manager/src/Validator/WritableFileSystemValidator.php
+++ b/package_manager/src/Validator/WritableFileSystemValidator.php
@@ -35,10 +35,8 @@ class WritableFileSystemValidator implements EventSubscriberInterface {
/**
* Checks that the file system is writable.
*
- * @todo It might make sense to use a more sophisticated method of testing
- * writability than is_writable(), since it's not clear if that can return
- * false negatives/positives due to things like SELinux, exotic file
- * systems, and so forth.
+ * @todo Determine if 'is_writable()' is a sufficiently robust test across
+ * different operating systems in https://drupal.org/i/3348253.
*/
public function validate(PreOperationStageEvent $event): void {
$messages = [];
diff --git a/package_manager/tests/modules/package_manager_test_release_history/src/TestController.php b/package_manager/tests/modules/package_manager_test_release_history/src/TestController.php
index 3ed2d19796d1d094f85a2950364ece31ae8e9605..bac2fbbb78eabf9707eb98a2fe26f3f153a5e6ab 100644
--- a/package_manager/tests/modules/package_manager_test_release_history/src/TestController.php
+++ b/package_manager/tests/modules/package_manager_test_release_history/src/TestController.php
@@ -13,10 +13,11 @@ class TestController extends ControllerBase {
/**
* Page callback: Prints mock XML for the Update Manager module.
*
- * This is a wholesale copy of
- * \Drupal\update_test\Controller\UpdateTestController::updateTest() for
- * testing automatic updates. This was done in order to use a different
- * directory of mock XML files.
+ * @todo This is a wholesale copy of
+ * \Drupal\update_test\Controller\UpdateTestController::updateTest() for
+ * testing package_manager. This was done in order to use a different
+ * directory of mock XML files. Remove this module in
+ * https://drupal.org/i/3274826.
*/
public function metadata($project_name = 'drupal', $version = NULL): Response {
$xml_map = $this->config('update_test.settings')->get('xml_map');
diff --git a/package_manager/tests/src/Build/TemplateProjectTestBase.php b/package_manager/tests/src/Build/TemplateProjectTestBase.php
index 9a32dfb44b5bacbf7c78a8b3f74b612643787e3e..6b01c1a98c31b38a270258a51dbfc433b9f46bca 100644
--- a/package_manager/tests/src/Build/TemplateProjectTestBase.php
+++ b/package_manager/tests/src/Build/TemplateProjectTestBase.php
@@ -517,8 +517,6 @@ END;
// We need to be sure we are seeing all entries, not just first page.
// Since we don't need to log anywhere near 50 entries use 25 to be overly
// cautious of the view changing.
- // @todo Find a better solution than a view that could change to ensure
- // ensure these events have fired in https://drupal.org/i/3319768.
$this->assertLessThan(25, count($expected_events), 'More than 25 events may not appear on one page of the log view');
}
$assert_session = $this->getMink()->assertSession();
diff --git a/package_manager/tests/src/Kernel/CorePackageManifestTest.php b/package_manager/tests/src/Kernel/CorePackageManifestTest.php
deleted file mode 100644
index 12596e0d262a43498e5769b77c0f55f0f116fea5..0000000000000000000000000000000000000000
--- a/package_manager/tests/src/Kernel/CorePackageManifestTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\Tests\package_manager\Kernel;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Component\Serialization\Yaml;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\Tests\package_manager\Traits\AssertPreconditionsTrait;
-use Symfony\Component\Finder\Finder;
-
-/**
- * Tests that core's Composer packages are properly accounted for.
- *
- * In order to identify which Composer packages are part of Drupal core, we need
- * to maintain a single hard-coded list (core_packages.json). This test confirms
- * that the list mentions all of the Composer plugins and metapackages provided
- * by Drupal core.
- *
- * @todo Move this test, and the package list, to a more central place in core.
- * For example, the list could live in core/assets, and this test could live
- * in the Drupal\Tests\Composer namespace.
- *
- * @group package_manager
- * @internal
- */
-class CorePackageManifestTest extends KernelTestBase {
-
- use AssertPreconditionsTrait;
-
- /**
- * Tests that detected core packages match our hard-coded manifest file.
- */
- public function testCorePackagesMatchManifest(): void {
- // Scan for all the composer.json files of said metapackages and plugins,
- // ignoring the project templates. If we are not running in git clone of
- // Drupal core, this will fail since the 'composer' directory won't exist.
- $finder = Finder::create()
- ->in($this->getDrupalRoot() . '/composer')
- ->name('composer.json')
- ->notPath('Template');
-
- // Always consider drupal/core a valid core package, even though it's not a
- // metapackage or plugin.
- $packages = ['drupal/core'];
- foreach ($finder as $file) {
- $data = Json::decode($file->getContents());
- $packages[] = $data['name'];
- }
- sort($packages);
-
- // Ensure that the packages we detected matches the hard-coded list we ship.
- $manifest = file_get_contents(__DIR__ . '/../../../core_packages.yml');
- $manifest = Yaml::decode($manifest);
- $this->assertSame($packages, $manifest);
- }
-
-}
diff --git a/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php b/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
index bacf59f8b85aa3826b0ee61dacd7077b305692a3..33ea4650e9eaeb72e7c4b378e61dda19be36c7f2 100644
--- a/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
+++ b/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
@@ -322,6 +322,9 @@ abstract class PackageManagerKernelTestBase extends KernelTestBase {
/**
* Sets the current (running) version of core, as known to the Update module.
*
+ * @todo Remove this function with use of the trait from the Update module in
+ * https://drupal.org/i/3348234.
+ *
* @param string $version
* The current version of core.
*/
diff --git a/package_manager/tests/src/Kernel/ProjectInfoTest.php b/package_manager/tests/src/Kernel/ProjectInfoTest.php
index e29be5c38e78284b977d34e6f4b1bcd3e5cb7cf6..3dd465293a3e808b47f8dffaf8995202ab550804 100644
--- a/package_manager/tests/src/Kernel/ProjectInfoTest.php
+++ b/package_manager/tests/src/Kernel/ProjectInfoTest.php
@@ -39,6 +39,7 @@ class ProjectInfoTest extends PackageManagerKernelTestBase {
'version' => $installed_version,
'project' => 'aaa_package_manager_test',
];
+ // @todo Replace with use of the trait from the Update module in https://drupal.org/i/3348234.
$this->config('update_test.settings')
->set("system_info.$project", $extension_info_update)
->save();
diff --git a/src/BatchProcessor.php b/src/BatchProcessor.php
index 8bb86b0f59553361844055e6ccf41438772760c5..f9efa57c4516b9a68a702ace8f17fdf135ebe05a 100644
--- a/src/BatchProcessor.php
+++ b/src/BatchProcessor.php
@@ -117,8 +117,6 @@ final class BatchProcessor {
// 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) {
diff --git a/src/CronUpdater.php b/src/CronUpdater.php
index 60543c7a5c9ad68434894e016312b6d5d837098a..14cb731c403ab115e2e312c7d6a9af2a25dfcd56 100644
--- a/src/CronUpdater.php
+++ b/src/CronUpdater.php
@@ -266,8 +266,6 @@ class CronUpdater extends Updater {
// If we're using a single-threaded web server (e.g., the built-in PHP web
// server used in build tests), allow the post-apply request to be sent to
// an alternate port.
- // @todo If using the built-in PHP web server, validate that this port is
- // set in https://www.drupal.org/i/3293146.
$port = $this->configFactory->get('automatic_updates.settings')
->get('cron_port');
if ($port) {
diff --git a/src/Form/UpdaterForm.php b/src/Form/UpdaterForm.php
index 14a637dcef0df7555c747d175eca9e32cf035793..f8c6b9dfd842701051c4d8af60d7a0fa056c3924 100644
--- a/src/Form/UpdaterForm.php
+++ b/src/Form/UpdaterForm.php
@@ -395,8 +395,6 @@ final class UpdaterForm extends UpdateFormBase {
],
'target_version' => [
'data' => [
- // @todo Is an inline template the right tool here? Is there an Update
- // module template we should use instead?
'#type' => 'inline_template',
'#template' => '{{ release_version }} (<a href="{{ release_link }}" title="{{ project_title }}">{{ release_notes }}</a>)',
'#context' => [
diff --git a/src/Validator/StagedProjectsValidator.php b/src/Validator/StagedProjectsValidator.php
index 7049429cacd2c706ef5e4c2b272d23fee97cfd48..201870feb45e2138656b79800b457ccb0c029816 100644
--- a/src/Validator/StagedProjectsValidator.php
+++ b/src/Validator/StagedProjectsValidator.php
@@ -48,16 +48,8 @@ final class StagedProjectsValidator implements EventSubscriberInterface {
return;
}
- // @todo Remove or update the try/catch blocks around these calls to
- // getInstalledPackagesList() in https://drupal.org/i/3344039.
- try {
- $active_list = $this->composerInspector->getInstalledPackagesList($this->pathLocator->getProjectRoot());
- $stage_list = $this->composerInspector->getInstalledPackagesList($stage->getStageDirectory());
- }
- catch (\Throwable $e) {
- $event->addError([$this->t('Unable to determine installed packages.')]);
- return;
- }
+ $active_list = $this->composerInspector->getInstalledPackagesList($this->pathLocator->getProjectRoot());
+ $stage_list = $this->composerInspector->getInstalledPackagesList($stage->getStageDirectory());
$type_map = [
'drupal-module' => $this->t('module'),
diff --git a/tests/modules/automatic_updates_test_cron/automatic_updates_test_cron.module b/tests/modules/automatic_updates_test_cron/automatic_updates_test_cron.module
index 2716bb75f6e1b615334b1324d03cd9558a555cdd..87b6b10b9c4839ea0bf9121c53044f0c4952924b 100644
--- a/tests/modules/automatic_updates_test_cron/automatic_updates_test_cron.module
+++ b/tests/modules/automatic_updates_test_cron/automatic_updates_test_cron.module
@@ -4,7 +4,8 @@
* @file
* Contains hook implementations to enable automatic updates during cron.
*
- * @todo Move into automatic_updates when TUF integration is stable.
+ * @todo Move into automatic_updates when TUF integration is stable in
+ * https://www.drupal.org/i/3284443.
*/
declare(strict_types=1);
@@ -17,8 +18,6 @@ use Drupal\update\ProjectSecurityData;
/**
* Implements hook_form_FORM_ID_alter() for 'update_settings' form.
- *
- * @todo Move to automatic_updates in https://www.drupal.org/i/3322361
*/
function automatic_updates_test_cron_form_update_settings_alter(array &$form, FormStateInterface $form_state, string $form_id) {
$project_info = new ProjectInfo('drupal');
diff --git a/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php b/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
index 8e1b54051bae20319cd5a90d6ad1637d89051c58..1636f8e86504e92b1fe4fb9b449127cc13d27096 100644
--- a/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
+++ b/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
@@ -79,6 +79,9 @@ abstract class AutomaticUpdatesFunctionalTestBase extends BrowserTestBase {
/**
* Mocks the current (running) version of core, as known to the Update module.
*
+ * @todo Remove this function with use of the trait from the Update module in
+ * https://drupal.org/i/3348234.
+ *
* @param string $version
* The version of core to mock.
*/
@@ -91,6 +94,9 @@ abstract class AutomaticUpdatesFunctionalTestBase extends BrowserTestBase {
/**
* Sets the release metadata file to use when fetching available updates.
*
+ * @todo Remove this function with use of the trait from the Update module in
+ * https://drupal.org/i/3348234.
+ *
* @param string $file
* The path of the XML metadata file to use.
*/
diff --git a/tests/src/Functional/NoUpdateButtonsTest.php b/tests/src/Functional/NoUpdateButtonsTest.php
index 64f6befcaf1f7c01f0479ca215afc1248570b6a5..19403bbf46ae82f0d9e4eb8a2ed8c38e4dcb1f6e 100644
--- a/tests/src/Functional/NoUpdateButtonsTest.php
+++ b/tests/src/Functional/NoUpdateButtonsTest.php
@@ -28,7 +28,7 @@ class NoUpdateButtonsTest extends UpdaterFormTestBase {
* Tests that the form doesn't display any buttons if Drupal is up-to-date.
*
* @todo Mark this test as skipped if the web server is PHP's built-in, single
- * threaded server.
+ * threaded server in https://drupal.org/i/3348251.
*
* @param string $update_form_url
* The URL of the update form to visit.
diff --git a/tests/src/Functional/StatusCheckTest.php b/tests/src/Functional/StatusCheckTest.php
index 51cc7f5040212b59e5e1e459db01bcefd1f6e2b8..be28a5fd5e86fd6de1db51bc1afaf58417f6844d 100644
--- a/tests/src/Functional/StatusCheckTest.php
+++ b/tests/src/Functional/StatusCheckTest.php
@@ -181,8 +181,6 @@ class StatusCheckTest extends AutomaticUpdatesFunctionalTestBase {
$assert->pageTextMatchesCount(2, '/' . preg_quote(static::$errorsExplanation) . '/');
$this->assertErrors($expected_results, TRUE);
- // @todo Should we always show when the checks were last run and a link to
- // run when there is an error?
// Confirm a user without permission to run the checks sees the same error.
$this->drupalLogin($this->reportViewerUser);
$this->drupalGet('admin/reports/status');
diff --git a/tests/src/Functional/UpdaterFormNoRecommendedReleaseMessageTest.php b/tests/src/Functional/UpdaterFormNoRecommendedReleaseMessageTest.php
index f5be5aa0352868d614a23d262db9bebc75c2080c..432e5424abe1deadab94e9454fbb0acae4b09193 100644
--- a/tests/src/Functional/UpdaterFormNoRecommendedReleaseMessageTest.php
+++ b/tests/src/Functional/UpdaterFormNoRecommendedReleaseMessageTest.php
@@ -90,17 +90,12 @@ class UpdaterFormNoRecommendedReleaseMessageTest extends AutomaticUpdatesFunctio
$this->drupalGet('/admin/reports/updates/update');
$assert_session = $this->assertSession();
- // BEGIN: DELETE FROM CORE MERGE REQUEST
- // @todo Use \Drupal\Tests\WebAssert::statusMessageContains() when module
- // drops support for Drupal core 9.3.x.
- // END: DELETE FROM CORE MERGE REQUEST
- $message_selector = $expected_message_type === 'status' ? "//div[@role='contentinfo' and h2[text()='Status message']]" : "//div[@role='alert' and h2[text()='Error message']]";
if ($updates_available) {
- $assert_session->elementTextContains('xpath', $message_selector, 'Updates were found, but they must be performed manually.');
+ $assert_session->statusMessageContains('Updates were found, but they must be performed manually.', $expected_message_type);
$assert_session->linkExists('the list of available updates');
}
else {
- $assert_session->elementTextContains('xpath', $message_selector, 'No update available');
+ $assert_session->statusMessageContains('No update available', $expected_message_type);
}
$assert_session->buttonNotExists('Update');
}
diff --git a/tests/src/Kernel/StatusCheck/StagedProjectsValidatorTest.php b/tests/src/Kernel/StatusCheck/StagedProjectsValidatorTest.php
index b7abd13bbfd19326b6eeb0f7ca8e6a360ab3bbf5..d422e360d18e370e1ac6b8b236dfa92784f32050 100644
--- a/tests/src/Kernel/StatusCheck/StagedProjectsValidatorTest.php
+++ b/tests/src/Kernel/StatusCheck/StagedProjectsValidatorTest.php
@@ -5,11 +5,8 @@ declare(strict_types = 1);
namespace Drupal\Tests\automatic_updates\Kernel\StatusCheck;
use Drupal\automatic_updates\Updater;
-use Drupal\automatic_updates\Validator\StagedProjectsValidator;
use Drupal\fixture_manipulator\ActiveFixtureManipulator;
-use Drupal\package_manager\Event\PreApplyEvent;
use Drupal\package_manager\Exception\StageEventException;
-use Drupal\package_manager\PathLocator;
use Drupal\package_manager\ValidationResult;
use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
@@ -35,40 +32,6 @@ class StagedProjectsValidatorTest extends AutomaticUpdatesKernelTestBase {
parent::setUp();
}
- /**
- * Tests that exceptions are turned into validation errors.
- */
- public function testEventConsumesExceptionResults(): void {
- $composer_json = $this->container->get(PathLocator::class)
- ->getProjectRoot();
- $composer_json .= '/composer.json';
-
- $listener = function (PreApplyEvent $event) use ($composer_json): void {
- unlink($composer_json);
- // Directly invoke the validator under test, which should raise a
- // validation error.
- $this->container->get(StagedProjectsValidator::class)
- ->validateStagedProjects($event);
- // Prevent any other event subscribers from running, since they might try
- // to read the file we just deleted.
- $event->stopPropagation();
- };
- $this->addEventTestListener($listener);
-
- $updater = $this->container->get(Updater::class);
- $updater->begin(['drupal' => '9.8.1']);
- $updater->stage();
-
- $error = ValidationResult::createError([t('Unable to determine installed packages.')]);
- try {
- $updater->apply();
- $this->fail('Expected an error, but none was raised.');
- }
- catch (StageEventException $e) {
- $this->assertExpectedResultsFromException([$error], $e);
- }
- }
-
/**
* Tests that an error is raised if Drupal extensions are unexpectedly added.
*/