diff --git a/package_manager/src/PathLocator.php b/package_manager/src/PathLocator.php
index 8e14b31156c05ceed2d2ad26bb7213fc3540364d..dabad2e653ed471966ab9571aba5e998e7514bdc 100644
--- a/package_manager/src/PathLocator.php
+++ b/package_manager/src/PathLocator.php
@@ -26,16 +26,6 @@ class PathLocator {
$this->appRoot = $app_root;
}
- /**
- * Returns the path of the active code base.
- *
- * @return string
- * The absolute path of the active, running code base.
- */
- public function getActiveDirectory(): string {
- return $this->getProjectRoot();
- }
-
/**
* Returns the absolute path of the project root.
*
diff --git a/package_manager/src/Stage.php b/package_manager/src/Stage.php
index 711da3a019d7204793ef8712db41ac73e5f1a488..c109ea85edc342d8fa82fd51ed69ad5aa096e959 100644
--- a/package_manager/src/Stage.php
+++ b/package_manager/src/Stage.php
@@ -219,7 +219,7 @@ class Stage {
$this->tempStore->set(static::TEMPSTORE_LOCK_KEY, [$id, static::class]);
$this->claim($id);
- $active_dir = $this->pathLocator->getActiveDirectory();
+ $active_dir = $this->pathLocator->getProjectRoot();
$stage_dir = $this->getStageDirectory();
$event = new PreCreateEvent($this);
@@ -262,7 +262,7 @@ class Stage {
public function apply(): void {
$this->checkOwnership();
- $active_dir = $this->pathLocator->getActiveDirectory();
+ $active_dir = $this->pathLocator->getProjectRoot();
$stage_dir = $this->getStageDirectory();
$event = new PreApplyEvent($this);
@@ -363,7 +363,7 @@ class Stage {
* The Composer utility object.
*/
public function getActiveComposer(): ComposerUtility {
- $dir = $this->pathLocator->getActiveDirectory();
+ $dir = $this->pathLocator->getProjectRoot();
return ComposerUtility::createForDirectory($dir);
}
diff --git a/package_manager/src/Validator/LockFileValidator.php b/package_manager/src/Validator/LockFileValidator.php
index 15a3a977d5dafcc716ae6218929e3a8a1b75b945..7f29b5e1cc67cc8fc371bc5e5f84c14dc5b07fac 100644
--- a/package_manager/src/Validator/LockFileValidator.php
+++ b/package_manager/src/Validator/LockFileValidator.php
@@ -64,7 +64,7 @@ class LockFileValidator implements PreOperationStageValidatorInterface {
* does not exist.
*/
protected function getHash() {
- $file = $this->pathLocator->getActiveDirectory() . DIRECTORY_SEPARATOR . 'composer.lock';
+ $file = $this->pathLocator->getProjectRoot() . DIRECTORY_SEPARATOR . 'composer.lock';
// We want to directly hash the lock file itself, rather than look at its
// content-hash value, which is actually a hash of the relevant parts of
// composer.json. We're trying to verify that the actual installed packages
diff --git a/package_manager/tests/src/Kernel/ComposerSettingsValidatorTest.php b/package_manager/tests/src/Kernel/ComposerSettingsValidatorTest.php
index af6f12bde624b4aa748455f318d0b71ac8b8388f..071bbfc823e47eaed78a00299d8ac96629999125 100644
--- a/package_manager/tests/src/Kernel/ComposerSettingsValidatorTest.php
+++ b/package_manager/tests/src/Kernel/ComposerSettingsValidatorTest.php
@@ -61,7 +61,7 @@ class ComposerSettingsValidatorTest extends PackageManagerKernelTestBase {
public function testSecureHttpValidation(string $contents, array $expected_results): void {
$this->createTestProject();
$active_dir = $this->container->get('package_manager.path_locator')
- ->getActiveDirectory();
+ ->getProjectRoot();
file_put_contents("$active_dir/composer.json", $contents);
try {
diff --git a/package_manager/tests/src/Kernel/ExcludedPathsTest.php b/package_manager/tests/src/Kernel/ExcludedPathsTest.php
index 79071491d1278ecfc5191de0a71e40f1588935f2..d406fcac95046177d430251d99e39c5f1e6b3f0b 100644
--- a/package_manager/tests/src/Kernel/ExcludedPathsTest.php
+++ b/package_manager/tests/src/Kernel/ExcludedPathsTest.php
@@ -42,7 +42,7 @@ class ExcludedPathsTest extends PackageManagerKernelTestBase {
$this->createTestProject();
$active_dir = $this->container->get('package_manager.path_locator')
- ->getActiveDirectory();
+ ->getProjectRoot();
$site_path = 'sites/example.com';
// Ensure that we are using directories within the fake site fixture for
@@ -199,7 +199,7 @@ class ExcludedPathsTest extends PackageManagerKernelTestBase {
public function testUnreadableDirectoriesAreIgnored(): void {
$this->createTestProject();
$active_dir = $this->container->get('package_manager.path_locator')
- ->getActiveDirectory();
+ ->getProjectRoot();
// Create an unreadable directory within the active directory, which will
// raise an exception as the event subscriber tries to scan for .git
diff --git a/package_manager/tests/src/Kernel/LockFileValidatorTest.php b/package_manager/tests/src/Kernel/LockFileValidatorTest.php
index c6cfeb535d4c043213216be339947822b2781aed..4126a41d4837f109ff3851941dd80f9343f10e95 100644
--- a/package_manager/tests/src/Kernel/LockFileValidatorTest.php
+++ b/package_manager/tests/src/Kernel/LockFileValidatorTest.php
@@ -29,7 +29,7 @@ class LockFileValidatorTest extends PackageManagerKernelTestBase {
parent::setUp();
$this->createTestProject();
$this->activeDir = $this->container->get('package_manager.path_locator')
- ->getActiveDirectory();
+ ->getProjectRoot();
}
/**
diff --git a/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php b/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
index 25d08dac8b6a71e4cc8f67f011e8e7e842c9ba6f..1cb6afab368ebc73872c1a2e60f5765175dd16a3 100644
--- a/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
+++ b/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
@@ -218,7 +218,6 @@ END,
TestStage::$stagingRoot = "$root/stage";
$path_locator = $this->prophesize(PathLocator::class);
- $path_locator->getActiveDirectory()->willReturn($active_dir);
$path_locator->getProjectRoot()->willReturn($active_dir);
$path_locator->getWebRoot()->willReturn('');
$path_locator->getVendorDirectory()->willReturn("$active_dir/vendor");
@@ -238,7 +237,7 @@ END,
// By default, the validator should report that the root, vendor, and
// temporary directories have basically infinite free space.
$validator->freeSpace = [
- $path_locator->getActiveDirectory() => PHP_INT_MAX,
+ $path_locator->getProjectRoot() => PHP_INT_MAX,
$path_locator->getVendorDirectory() => PHP_INT_MAX,
$validator->temporaryDirectory() => PHP_INT_MAX,
];
diff --git a/src/Updater.php b/src/Updater.php
index 79497eacfd89a47f5fe8c426fa85a8065b7e3062..30b4e676a8b7f245a48682a7369ee988537ff7f8 100644
--- a/src/Updater.php
+++ b/src/Updater.php
@@ -30,7 +30,7 @@ class Updater extends Stage {
throw new \InvalidArgumentException("Currently only updates to Drupal core are supported.");
}
- $composer = ComposerUtility::createForDirectory($this->pathLocator->getActiveDirectory());
+ $composer = ComposerUtility::createForDirectory($this->pathLocator->getProjectRoot());
$package_versions = [
'production' => [],
'dev' => [],
diff --git a/src/Validation/ReadinessValidationManager.php b/src/Validation/ReadinessValidationManager.php
index 4dac6438656c6a3dbdc094f846a4ef6b3ea11d84..72ae38654bcb8a15fa10045bd4c56baa842059a1 100644
--- a/src/Validation/ReadinessValidationManager.php
+++ b/src/Validation/ReadinessValidationManager.php
@@ -89,7 +89,7 @@ class ReadinessValidationManager {
* @return $this
*/
public function run(): self {
- $composer = ComposerUtility::createForDirectory($this->pathLocator->getActiveDirectory());
+ $composer = ComposerUtility::createForDirectory($this->pathLocator->getProjectRoot());
$recommender = new UpdateRecommender();
$release = $recommender->getRecommendedRelease(TRUE);
diff --git a/src/Validator/StagedDatabaseUpdateValidator.php b/src/Validator/StagedDatabaseUpdateValidator.php
index 0fea7e697ca87561a1b268d5115d4986c98453e5..061a00b35a13ae864bca8d0ef2937c7f1fe295ff 100644
--- a/src/Validator/StagedDatabaseUpdateValidator.php
+++ b/src/Validator/StagedDatabaseUpdateValidator.php
@@ -60,7 +60,7 @@ class StagedDatabaseUpdateValidator implements EventSubscriberInterface {
return;
}
- $active_dir = $this->pathLocator->getActiveDirectory();
+ $active_dir = $this->pathLocator->getProjectRoot();
$stage_dir = $stage->getStageDirectory();
$web_root = $this->pathLocator->getWebRoot();
diff --git a/tests/src/Kernel/ReadinessValidation/CoreComposerValidatorTest.php b/tests/src/Kernel/ReadinessValidation/CoreComposerValidatorTest.php
index 3a0fdb99dc50a58f4f5682f6a93388b935925e6a..03930a36b95902782f83527957241feff52026fe 100644
--- a/tests/src/Kernel/ReadinessValidation/CoreComposerValidatorTest.php
+++ b/tests/src/Kernel/ReadinessValidation/CoreComposerValidatorTest.php
@@ -28,7 +28,6 @@ class CoreComposerValidatorTest extends AutomaticUpdatesKernelTestBase {
// Point to a valid composer.json with no requirements.
$active_dir = __DIR__ . '/../../../fixtures/project_staged_validation/no_core_requirements';
$locator = $this->prophesize(PathLocator::class);
- $locator->getActiveDirectory()->willReturn($active_dir);
$locator->getProjectRoot()->willReturn($active_dir);
$locator->getVendorDirectory()->willReturn($active_dir . '/vendor');
$this->container->set('package_manager.path_locator', $locator->reveal());
diff --git a/tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php b/tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php
index 27f1cb965c6f260ba015e9663eb1defbeaefe3c6..2ed0e70035b8c605b41909d16356e37887d40c41 100644
--- a/tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php
+++ b/tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php
@@ -62,7 +62,6 @@ class StagedProjectsValidatorTest extends AutomaticUpdatesKernelTestBase {
private function validate(string $active_dir, string $stage_dir): array {
$locator = $this->prophesize(PathLocator::class);
- $locator->getActiveDirectory()->willReturn($active_dir);
$locator->getProjectRoot()->willReturn($active_dir);
$locator->getWebRoot()->willReturn('');
$locator->getVendorDirectory()->willReturn($active_dir);
diff --git a/tests/src/Kernel/UpdaterTest.php b/tests/src/Kernel/UpdaterTest.php
index d8d9c4a2a2f58d957898938283b7c6e3303a4046..7cabf9e29da2707c191d77411f916e2ff03e11c8 100644
--- a/tests/src/Kernel/UpdaterTest.php
+++ b/tests/src/Kernel/UpdaterTest.php
@@ -49,7 +49,6 @@ class UpdaterTest extends AutomaticUpdatesKernelTestBase {
// result in drupal/core-recommended being updated.
$fixture_dir = __DIR__ . '/../../fixtures/fake-site';
$locator = $this->prophesize(PathLocator::class);
- $locator->getActiveDirectory()->willReturn($fixture_dir);
$locator->getProjectRoot()->willReturn($fixture_dir);
$locator->getWebRoot()->willReturn('');
$locator->getVendorDirectory()->willReturn($fixture_dir);