Skip to content

Commit 29d0a00

Browse files
authored
Fix InstalledPackageResolver cwd fallback lost by promoted property (#8237)
1 parent 8b14eaa commit 29d0a00

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

‎src/Composer/InstalledPackageResolver.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ final class InstalledPackageResolver
2121
*/
2222
private ?array $resolvedInstalledPackages = null;
2323

24-
public function __construct(
25-
private readonly ?string $projectDirectory = null
26-
) {
24+
private readonly string $projectDirectory;
25+
26+
public function __construct(?string $projectDirectory = null)
27+
{
2728
// fallback to root project directory
28-
if ($projectDirectory === null) {
29-
$projectDirectory = getcwd();
30-
}
29+
$this->projectDirectory = $projectDirectory ?? (string) getcwd();
3130

32-
Assert::directory($projectDirectory);
31+
Assert::directory($this->projectDirectory);
3332
}
3433

3534
/**

‎tests/Composer/InstalledPackageResolverTest.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,13 @@ public function test(): void
1818
$this->assertContainsOnlyInstancesOf(InstalledPackage::class, $installedPackages);
1919
$this->assertGreaterThan(77, count($installedPackages));
2020
}
21+
22+
public function testFallbackToCurrentWorkingDirectory(): void
23+
{
24+
$installedPackageResolver = new InstalledPackageResolver();
25+
$installedPackages = $installedPackageResolver->resolve();
26+
27+
$this->assertContainsOnlyInstancesOf(InstalledPackage::class, $installedPackages);
28+
$this->assertGreaterThan(77, count($installedPackages));
29+
}
2130
}

0 commit comments

Comments
 (0)