Skip to content

Commit ea18a76

Browse files
authored
Ensure pass string on PathNormalizer::normalize() on InstalledPackageResolver (#6865)
* Ensure pass string on PathNormalizer::normalize() on InstalledPackageResolver * clean up
1 parent f6a3a1b commit ea18a76

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/Composer/InstalledPackageResolver.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,17 @@ private function resolveVendorDir(): string
8484
if (isset($projectComposerJson['config']['vendor-dir']) &&
8585
is_string($projectComposerJson['config']['vendor-dir'])
8686
) {
87-
return PathNormalizer::normalize(
88-
realpath($projectComposerJson['config']['vendor-dir'])
89-
) === PathNormalizer::normalize($projectComposerJson['config']['vendor-dir'])
87+
$realPathVendorDir = realpath($projectComposerJson['config']['vendor-dir']) ?: '';
88+
$normalizedRealPathVendorDir = PathNormalizer::normalize($realPathVendorDir);
89+
$normalizedVendorDir = PathNormalizer::normalize($projectComposerJson['config']['vendor-dir']);
90+
91+
return $normalizedRealPathVendorDir === $normalizedVendorDir
9092
? $projectComposerJson['config']['vendor-dir']
9193
: $this->projectDirectory . '/' . $projectComposerJson['config']['vendor-dir'];
9294
}
9395

9496
}
97+
9598
return $this->projectDirectory . '/vendor';
9699
}
97100
}

0 commit comments

Comments
 (0)