Skip to content

Commit 683d1e6

Browse files
committed
Updated Rector to commit ea18a76803897dc87bdf0dceba2f74356988bc38
rectorphp/rector-src@ea18a76 Ensure pass string on PathNormalizer::normalize() on InstalledPackageResolver (#6865)
1 parent 9e0c89d commit 683d1e6

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/Application/VersionResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = 'f6a3a1b6c6f5277def9560032a5e17a3fe6ebe21';
22+
public const PACKAGE_VERSION = 'ea18a76803897dc87bdf0dceba2f74356988bc38';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2025-04-24 22:39:05';
27+
public const RELEASE_DATE = '2025-04-24 15:52:43';
2828
/**
2929
* @var int
3030
*/

src/Composer/InstalledPackageResolver.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ private function resolveVendorDir() : string
6969
$projectComposerContents = FileSystem::read($projectComposerJsonFilePath);
7070
$projectComposerJson = Json::decode($projectComposerContents, \true);
7171
if (isset($projectComposerJson['config']['vendor-dir']) && \is_string($projectComposerJson['config']['vendor-dir'])) {
72-
return PathNormalizer::normalize(\realpath($projectComposerJson['config']['vendor-dir'])) === PathNormalizer::normalize($projectComposerJson['config']['vendor-dir']) ? $projectComposerJson['config']['vendor-dir'] : $this->projectDirectory . '/' . $projectComposerJson['config']['vendor-dir'];
72+
$realPathVendorDir = \realpath($projectComposerJson['config']['vendor-dir']) ?: '';
73+
$normalizedRealPathVendorDir = PathNormalizer::normalize($realPathVendorDir);
74+
$normalizedVendorDir = PathNormalizer::normalize($projectComposerJson['config']['vendor-dir']);
75+
return $normalizedRealPathVendorDir === $normalizedVendorDir ? $projectComposerJson['config']['vendor-dir'] : $this->projectDirectory . '/' . $projectComposerJson['config']['vendor-dir'];
7376
}
7477
}
7578
return $this->projectDirectory . '/vendor';

0 commit comments

Comments
 (0)