| @@ -321,9 +321,8 @@ | ||
| 321 | 321 | self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | $installed = array(); |
| 325 | - $copiedLocalDir = false; | |
| 326 | 325 | |
| 327 | 326 | if (self::$canGetVendors) { |
| 328 | 327 | foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { |
| 329 | 328 | if (isset(self::$installedByVendor[$vendorDir])) { |
| @@ -330,13 +329,11 @@ | ||
| 330 | 329 | $installed[] = self::$installedByVendor[$vendorDir]; |
| 331 | 330 | } elseif (is_file($vendorDir.'/composer/installed.php')) { |
| 332 | 331 | /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ |
| 333 | 332 | $required = require $vendorDir.'/composer/installed.php'; |
| 334 | - self::$installedByVendor[$vendorDir] = $required; | |
| 335 | - $installed[] = $required; | |
| 336 | - if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { | |
| 337 | - self::$installed = $required; | |
| 338 | - $copiedLocalDir = true; | |
| 333 | + $installed[] = self::$installedByVendor[$vendorDir] = $required; | |
| 334 | + if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { | |
| 335 | + self::$installed = $installed[count($installed) - 1]; | |
| 339 | 336 | } |
| 340 | 337 | } |
| 341 | 338 | } |
| 342 | 339 | } |
| @@ -352,9 +349,9 @@ | ||
| 352 | 349 | self::$installed = array(); |
| 353 | 350 | } |
| 354 | 351 | } |
| 355 | 352 | |
| 356 | - if (self::$installed !== array() && !$copiedLocalDir) { | |
| 353 | + if (self::$installed !== array()) { | |
| 357 | 354 | $installed[] = self::$installed; |
| 358 | 355 | } |
| 359 | 356 | |
| 360 | 357 | return $installed; |
