diff options
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/composer/InstalledVersions.php | 11 | ||||
| -rw-r--r-- | vendor/composer/installed.php | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 51e734a77..07b32ed6e 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -322,6 +322,7 @@ class InstalledVersions } $installed = array(); + $copiedLocalDir = false; if (self::$canGetVendors) { foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { @@ -330,9 +331,11 @@ class InstalledVersions } elseif (is_file($vendorDir.'/composer/installed.php')) { /** @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 */ $required = require $vendorDir.'/composer/installed.php'; - $installed[] = self::$installedByVendor[$vendorDir] = $required; - if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { - self::$installed = $installed[count($installed) - 1]; + self::$installedByVendor[$vendorDir] = $required; + $installed[] = $required; + if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { + self::$installed = $required; + $copiedLocalDir = true; } } } @@ -350,7 +353,7 @@ class InstalledVersions } } - if (self::$installed !== array()) { + if (self::$installed !== array() && !$copiedLocalDir) { $installed[] = self::$installed; } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index ab0b54ed5..75ed03742 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'zotlabs/hubzilla', 'pretty_version' => 'dev-9.4RC', 'version' => 'dev-9.4RC', - 'reference' => '67a9292aaa5246783b70ca3754b31924416d7f08', + 'reference' => 'e9222d0d9aed21816c8654fae074429afeda8f95', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -367,7 +367,7 @@ 'zotlabs/hubzilla' => array( 'pretty_version' => 'dev-9.4RC', 'version' => 'dev-9.4RC', - 'reference' => '67a9292aaa5246783b70ca3754b31924416d7f08', + 'reference' => 'e9222d0d9aed21816c8654fae074429afeda8f95', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), |