From 98892fa9217c08f41761afb93bdf4f2dd851712f Mon Sep 17 00:00:00 2001
From: Yash Rode <57207-yash.rode@users.noreply.drupalcode.org>
Date: Tue, 25 Apr 2023 18:15:33 +0000
Subject: [PATCH] Issue #3355553 by yash.rode, phenaproxima: Set the default
installer paths for Drupal in installComposerInstallers()
---
.../tests/src/Kernel/EnabledExtensionsValidatorTest.php | 2 --
package_manager/tests/src/Traits/ComposerInstallersTrait.php | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package_manager/tests/src/Kernel/EnabledExtensionsValidatorTest.php b/package_manager/tests/src/Kernel/EnabledExtensionsValidatorTest.php
index 617ee41191..3dfe9b2899 100644
--- a/package_manager/tests/src/Kernel/EnabledExtensionsValidatorTest.php
+++ b/package_manager/tests/src/Kernel/EnabledExtensionsValidatorTest.php
@@ -102,8 +102,6 @@ class EnabledExtensionsValidatorTest extends PackageManagerKernelTestBase {
public function testExtensionRemoved(array $packages, array $expected_results): void {
$project_root = $this->container->get(PathLocator::class)->getProjectRoot();
$this->installComposerInstallers($project_root);
- // @todo Remove this in https://www.drupal.org/project/automatic_updates/issues/3355553.
- $this->setInstallerPaths([], $project_root);
$active_manipulator = new ActiveFixtureManipulator();
$stage_manipulator = $this->getStageFixtureManipulator();
diff --git a/package_manager/tests/src/Traits/ComposerInstallersTrait.php b/package_manager/tests/src/Traits/ComposerInstallersTrait.php
index dd36538a26..2da3eed554 100644
--- a/package_manager/tests/src/Traits/ComposerInstallersTrait.php
+++ b/package_manager/tests/src/Traits/ComposerInstallersTrait.php
@@ -45,6 +45,9 @@ trait ComposerInstallersTrait {
->addConfig(['allow-plugins.composer/installers' => TRUE])
->commitChanges($dir);
(new Process(['composer', 'require', 'composer/installers:@dev', $working_dir_option]))->mustRun();
+
+ // Use the default installer paths for Drupal core and extensions.
+ $this->setInstallerPaths([], $dir);
}
/**
--
GitLab