Ensure pass string on PathNormalizer::normalize() on InstalledPackageResolver (#6865)

samsonasik · web-flow · commit ea18a7680389 · 2025-04-24T15:52:43.000Z
* Ensure pass string on PathNormalizer::normalize() on InstalledPackageResolver

* clean up
diff --git a/src/Composer/InstalledPackageResolver.php b/src/Composer/InstalledPackageResolver.php
@@ -84,14 +84,17 @@ private function resolveVendorDir(): string
             if (isset($projectComposerJson['config']['vendor-dir']) &&
                 is_string($projectComposerJson['config']['vendor-dir'])
             ) {
-                return PathNormalizer::normalize(
-                    realpath($projectComposerJson['config']['vendor-dir'])
-                ) === PathNormalizer::normalize($projectComposerJson['config']['vendor-dir'])
+                $realPathVendorDir = realpath($projectComposerJson['config']['vendor-dir']) ?: '';
+                $normalizedRealPathVendorDir = PathNormalizer::normalize($realPathVendorDir);
+                $normalizedVendorDir = PathNormalizer::normalize($projectComposerJson['config']['vendor-dir']);
+
+                return $normalizedRealPathVendorDir === $normalizedVendorDir
                     ? $projectComposerJson['config']['vendor-dir']
                     : $this->projectDirectory . '/' . $projectComposerJson['config']['vendor-dir'];
             }
 
         }
+
         return $this->projectDirectory . '/vendor';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,14 +84,17 @@ private function resolveVendorDir(): string`
`84`	`84`	`if (isset($projectComposerJson['config']['vendor-dir']) &&`
`85`	`85`	`is_string($projectComposerJson['config']['vendor-dir'])`
`86`	`86`	`) {`
`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`
`90`	`92`	`? $projectComposerJson['config']['vendor-dir']`
`91`	`93`	`: $this->projectDirectory . '/' . $projectComposerJson['config']['vendor-dir'];`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`}`
	`97`	`+`
`95`	`98`	`return $this->projectDirectory . '/vendor';`
`96`	`99`	`}`
`97`	`100`	`}`