Issue #3258667 by phenaproxima: PathLocator::getActiveDirectory() is redundant

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.
    *

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);
   }
 

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

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 {

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

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();
   }
 
   /**

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,
     ];

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' => [],

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);

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();

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());

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);

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);