diff --git a/package_manager/src/PathLocator.php b/package_manager/src/PathLocator.php index d8d0e50ceae4c0948715eb5ccb20217f29742a76..04f1046ab8ac110a87da708cc501b93855e32756 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 869e4b9f378530155deb6bcc57ad2b44cf920bd1..34b8de340702ba16b028a8f6347394acdf651f1e 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; } /**