Skip to content

Commit 3199a32

Browse files
Merge pull request #6767 from nextcloud/chore/composer-update
chore: Bump composer files with new composer version
2 parents ee3d8b9 + eee8071 commit 3199a32

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

composer/composer/InstalledVersions.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ private static function getInstalled()
322322
}
323323

324324
$installed = array();
325+
$copiedLocalDir = false;
325326

326327
if (self::$canGetVendors) {
327328
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
@@ -330,9 +331,11 @@ private static function getInstalled()
330331
} elseif (is_file($vendorDir.'/composer/installed.php')) {
331332
/** @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 */
332333
$required = require $vendorDir.'/composer/installed.php';
333-
$installed[] = self::$installedByVendor[$vendorDir] = $required;
334-
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
335-
self::$installed = $installed[count($installed) - 1];
334+
self::$installedByVendor[$vendorDir] = $required;
335+
$installed[] = $required;
336+
if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
337+
self::$installed = $required;
338+
$copiedLocalDir = true;
336339
}
337340
}
338341
}
@@ -350,7 +353,7 @@ private static function getInstalled()
350353
}
351354
}
352355

353-
if (self::$installed !== array()) {
356+
if (self::$installed !== array() && !$copiedLocalDir) {
354357
$installed[] = self::$installed;
355358
}
356359

composer/composer/installed.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-main',
55
'version' => 'dev-main',
6-
'reference' => '00b8b908ec601f3541533afb5f8addc06038423e',
6+
'reference' => 'ee3d8b90a4886b0ca38bbc3f89b4808426726066',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-main',
1515
'version' => 'dev-main',
16-
'reference' => '00b8b908ec601f3541533afb5f8addc06038423e',
16+
'reference' => 'ee3d8b90a4886b0ca38bbc3f89b4808426726066',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../',
1919
'aliases' => array(),

0 commit comments

Comments
 (0)