aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/composer
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/composer')
-rw-r--r--vendor/composer/InstalledVersions.php17
-rw-r--r--vendor/composer/autoload_classmap.php4
-rw-r--r--vendor/composer/autoload_static.php4
-rw-r--r--vendor/composer/installed.json14
-rw-r--r--vendor/composer/installed.php12
5 files changed, 33 insertions, 18 deletions
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index c6b54af7b..51e734a77 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -98,7 +98,7 @@ class InstalledVersions
{
foreach (self::getInstalled() as $installed) {
if (isset($installed['versions'][$packageName])) {
- return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+ return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
}
}
@@ -119,7 +119,7 @@ class InstalledVersions
*/
public static function satisfies(VersionParser $parser, $packageName, $constraint)
{
- $constraint = $parser->parseConstraints($constraint);
+ $constraint = $parser->parseConstraints((string) $constraint);
$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
return $provided->matches($constraint);
@@ -328,7 +328,9 @@ class InstalledVersions
if (isset(self::$installedByVendor[$vendorDir])) {
$installed[] = self::$installedByVendor[$vendorDir];
} elseif (is_file($vendorDir.'/composer/installed.php')) {
- $installed[] = self::$installedByVendor[$vendorDir] = require $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];
}
@@ -340,12 +342,17 @@ class InstalledVersions
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
if (substr(__DIR__, -8, 1) !== 'C') {
- self::$installed = require __DIR__ . '/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 __DIR__ . '/installed.php';
+ self::$installed = $required;
} else {
self::$installed = array();
}
}
- $installed[] = self::$installed;
+
+ if (self::$installed !== array()) {
+ $installed[] = self::$installed;
+ }
return $installed;
}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 3f3766e5b..5068fa432 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1184,6 +1184,7 @@ return array(
'Zotlabs\\Daemon\\Poller' => $baseDir . '/Zotlabs/Daemon/Poller.php',
'Zotlabs\\Daemon\\Queue' => $baseDir . '/Zotlabs/Daemon/Queue.php',
'Zotlabs\\Daemon\\Thumbnail' => $baseDir . '/Zotlabs/Daemon/Thumbnail.php',
+ 'Zotlabs\\Daemon\\Zotconvo' => $baseDir . '/Zotlabs/Daemon/Zotconvo.php',
'Zotlabs\\Extend\\Hook' => $baseDir . '/Zotlabs/Extend/Hook.php',
'Zotlabs\\Extend\\Route' => $baseDir . '/Zotlabs/Extend/Route.php',
'Zotlabs\\Extend\\Widget' => $baseDir . '/Zotlabs/Extend/Widget.php',
@@ -1287,6 +1288,7 @@ return array(
'Zotlabs\\Module\\Connedit' => $baseDir . '/Zotlabs/Module/Connedit.php',
'Zotlabs\\Module\\Contactedit' => $baseDir . '/Zotlabs/Module/Contactedit.php',
'Zotlabs\\Module\\Contactgroup' => $baseDir . '/Zotlabs/Module/Contactgroup.php',
+ 'Zotlabs\\Module\\Conversation' => $baseDir . '/Zotlabs/Module/Conversation.php',
'Zotlabs\\Module\\Cover_photo' => $baseDir . '/Zotlabs/Module/Cover_photo.php',
'Zotlabs\\Module\\Dav' => $baseDir . '/Zotlabs/Module/Dav.php',
'Zotlabs\\Module\\Defperms' => $baseDir . '/Zotlabs/Module/Defperms.php',
@@ -1738,6 +1740,8 @@ return array(
'Zotlabs\\Update\\_1253' => $baseDir . '/Zotlabs/Update/_1253.php',
'Zotlabs\\Update\\_1254' => $baseDir . '/Zotlabs/Update/_1254.php',
'Zotlabs\\Update\\_1255' => $baseDir . '/Zotlabs/Update/_1255.php',
+ 'Zotlabs\\Update\\_1256' => $baseDir . '/Zotlabs/Update/_1256.php',
+ 'Zotlabs\\Update\\_1257' => $baseDir . '/Zotlabs/Update/_1257.php',
'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php',
'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php',
'Zotlabs\\Web\\HTTPSig' => $baseDir . '/Zotlabs/Web/HTTPSig.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 4f8b2763d..4b9c6e122 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -1421,6 +1421,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Zotlabs\\Daemon\\Poller' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Poller.php',
'Zotlabs\\Daemon\\Queue' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Queue.php',
'Zotlabs\\Daemon\\Thumbnail' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Thumbnail.php',
+ 'Zotlabs\\Daemon\\Zotconvo' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Zotconvo.php',
'Zotlabs\\Extend\\Hook' => __DIR__ . '/../..' . '/Zotlabs/Extend/Hook.php',
'Zotlabs\\Extend\\Route' => __DIR__ . '/../..' . '/Zotlabs/Extend/Route.php',
'Zotlabs\\Extend\\Widget' => __DIR__ . '/../..' . '/Zotlabs/Extend/Widget.php',
@@ -1524,6 +1525,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Zotlabs\\Module\\Connedit' => __DIR__ . '/../..' . '/Zotlabs/Module/Connedit.php',
'Zotlabs\\Module\\Contactedit' => __DIR__ . '/../..' . '/Zotlabs/Module/Contactedit.php',
'Zotlabs\\Module\\Contactgroup' => __DIR__ . '/../..' . '/Zotlabs/Module/Contactgroup.php',
+ 'Zotlabs\\Module\\Conversation' => __DIR__ . '/../..' . '/Zotlabs/Module/Conversation.php',
'Zotlabs\\Module\\Cover_photo' => __DIR__ . '/../..' . '/Zotlabs/Module/Cover_photo.php',
'Zotlabs\\Module\\Dav' => __DIR__ . '/../..' . '/Zotlabs/Module/Dav.php',
'Zotlabs\\Module\\Defperms' => __DIR__ . '/../..' . '/Zotlabs/Module/Defperms.php',
@@ -1975,6 +1977,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Zotlabs\\Update\\_1253' => __DIR__ . '/../..' . '/Zotlabs/Update/_1253.php',
'Zotlabs\\Update\\_1254' => __DIR__ . '/../..' . '/Zotlabs/Update/_1254.php',
'Zotlabs\\Update\\_1255' => __DIR__ . '/../..' . '/Zotlabs/Update/_1255.php',
+ 'Zotlabs\\Update\\_1256' => __DIR__ . '/../..' . '/Zotlabs/Update/_1256.php',
+ 'Zotlabs\\Update\\_1257' => __DIR__ . '/../..' . '/Zotlabs/Update/_1257.php',
'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php',
'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php',
'Zotlabs\\Web\\HTTPSig' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPSig.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 9a4a2a6d8..02a8faa7a 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2019,23 +2019,23 @@
},
{
"name": "twbs/bootstrap",
- "version": "v5.3.0-alpha1",
- "version_normalized": "5.3.0.0-alpha1",
+ "version": "v5.3.0-alpha3",
+ "version_normalized": "5.3.0.0-alpha3",
"source": {
"type": "git",
"url": "https://github.com/twbs/bootstrap.git",
- "reference": "cf9454caa00872899215603e5e036d9a824b1b11"
+ "reference": "ac576614a5515e429f27e756fad81d5aa05e95a6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twbs/bootstrap/zipball/cf9454caa00872899215603e5e036d9a824b1b11",
- "reference": "cf9454caa00872899215603e5e036d9a824b1b11",
+ "url": "https://api.github.com/repos/twbs/bootstrap/zipball/ac576614a5515e429f27e756fad81d5aa05e95a6",
+ "reference": "ac576614a5515e429f27e756fad81d5aa05e95a6",
"shasum": ""
},
"replace": {
"twitter/bootstrap": "self.version"
},
- "time": "2022-12-24T16:37:22+00:00",
+ "time": "2023-04-03T07:26:50+00:00",
"type": "library",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
@@ -2066,7 +2066,7 @@
],
"support": {
"issues": "https://github.com/twbs/bootstrap/issues",
- "source": "https://github.com/twbs/bootstrap/tree/v5.3.0-alpha1"
+ "source": "https://github.com/twbs/bootstrap/tree/v5.3.0-alpha3"
},
"install-path": "../twbs/bootstrap"
},
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 7a0de70bf..3bf54862e 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'zotlabs/hubzilla',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => 'd43a56614cd93982d19f4f82aae6e62f9ca533a9',
+ 'reference' => '1ed8b9dd149b9d2cb2fe30dc56ddc24cc523255c',
'type' => 'application',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -269,9 +269,9 @@
'dev_requirement' => false,
),
'twbs/bootstrap' => array(
- 'pretty_version' => 'v5.3.0-alpha1',
- 'version' => '5.3.0.0-alpha1',
- 'reference' => 'cf9454caa00872899215603e5e036d9a824b1b11',
+ 'pretty_version' => 'v5.3.0-alpha3',
+ 'version' => '5.3.0.0-alpha3',
+ 'reference' => 'ac576614a5515e429f27e756fad81d5aa05e95a6',
'type' => 'library',
'install_path' => __DIR__ . '/../twbs/bootstrap',
'aliases' => array(),
@@ -280,7 +280,7 @@
'twitter/bootstrap' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => 'v5.3.0-alpha1',
+ 0 => 'v5.3.0-alpha3',
),
),
'voku/portable-ascii' => array(
@@ -304,7 +304,7 @@
'zotlabs/hubzilla' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => 'd43a56614cd93982d19f4f82aae6e62f9ca533a9',
+ 'reference' => '1ed8b9dd149b9d2cb2fe30dc56ddc24cc523255c',
'type' => 'application',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 14:47:57 +0000