signalytic/streamline-emr
1
0
Fork 0
mirror of https://gitlab.com/signalytic/client-external/streamline/streamline-emr.git synced 2026-09-11 18:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
admin
2025-03-31 03:46:05 +03:00
parent b0a69145d7 c7fdd2968a
commit 2dc2287379
6454 changed files with 1520539 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/statistics/vendor/composer/InstalledVersions.php
Vendored
+18
View File
@@ -320,15 +320,26 @@ class InstalledVersions
}
$installed = array();
$copiedLocalDir = false;
if (self::$canGetVendors) {
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
if (isset(self::$installedByVendor[$vendorDir])) {
$installed[] = self::$installedByVendor[$vendorDir];
} elseif (is_file($vendorDir.'/composer/installed.php')) {
<<<<<<< HEAD:docker/statistics/vendor/composer/InstalledVersions.php
$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
self::$installed = $installed[count($installed) - 1];
=======
/** @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';
self::$installedByVendor[$vendorDir] = $required;
$installed[] = $required;
if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
self::$installed = $required;
$copiedLocalDir = true;
>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/composer/InstalledVersions.php
}
}
}
@@ -343,7 +354,14 @@ class InstalledVersions
self::$installed = array();
}
}
<<<<<<< HEAD:docker/statistics/vendor/composer/InstalledVersions.php
$installed[] = self::$installed;
=======
if (self::$installed !== array() && !$copiedLocalDir) {
$installed[] = self::$installed;
}
>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/composer/InstalledVersions.php
return $installed;
}