From 000355b060a238435e105acfcba4126736882a33 Mon Sep 17 00:00:00 2001
From: omkar podey <omkar.podey@acquia.com>
Date: Mon, 21 Nov 2022 12:28:24 +0530
Subject: [PATCH] moved to package_manager_bypass
---
package_manager/src/PathLocator.php | 7 +------
.../modules/package_manager_bypass/src/PathLocator.php | 6 +++++-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/package_manager/src/PathLocator.php b/package_manager/src/PathLocator.php
index d8d0e50cea..04f1046ab8 100644
--- a/package_manager/src/PathLocator.php
+++ b/package_manager/src/PathLocator.php
@@ -69,12 +69,7 @@ class PathLocator {
*/
public function getProjectRoot(): string {
// Assume that the vendor directory is immediately below the project root.
- $project_root = $this->getVendorDirectory() . DIRECTORY_SEPARATOR . '..';
-
- // @see https://github.com/bovigo/vfsStream/issues/207
- return !str_starts_with($project_root, 'vfs://')
- ? realpath($project_root)
- : $project_root;
+ return realpath($this->getVendorDirectory() . DIRECTORY_SEPARATOR . '..');
}
/**
diff --git a/package_manager/tests/modules/package_manager_bypass/src/PathLocator.php b/package_manager/tests/modules/package_manager_bypass/src/PathLocator.php
index 869e4b9f37..34b8de3407 100644
--- a/package_manager/tests/modules/package_manager_bypass/src/PathLocator.php
+++ b/package_manager/tests/modules/package_manager_bypass/src/PathLocator.php
@@ -34,7 +34,11 @@ class PathLocator extends BasePathLocator {
* {@inheritdoc}
*/
public function getProjectRoot(): string {
- return $this->state->get(static::class . ' root', parent::getProjectRoot());
+ $project_root = $this->getVendorDirectory() . DIRECTORY_SEPARATOR . '..';
+ // @see https://github.com/bovigo/vfsStream/issues/207
+ return !str_starts_with($project_root, 'vfs://')
+ ? realpath($project_root)
+ : $project_root;
}
/**
--
GitLab