diff --git a/composer.lock b/composer.lock index 9eeb02ea1..4b1e1cea6 100644 --- a/composer.lock +++ b/composer.lock @@ -3852,16 +3852,16 @@ }, { "name": "sabre/http", - "version": "5.1.7", + "version": "5.1.10", "source": { "type": "git", "url": "https://github.com/sabre-io/http.git", - "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7" + "reference": "f9f3d1fba8916fa2f4ec25636c4fedc26cb94e02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/http/zipball/b6fa04f42f49156eaab3fb890c79f4c43a9559b7", - "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7", + "url": "https://api.github.com/repos/sabre-io/http/zipball/f9f3d1fba8916fa2f4ec25636c4fedc26cb94e02", + "reference": "f9f3d1fba8916fa2f4ec25636c4fedc26cb94e02", "shasum": "" }, "require": { @@ -3911,7 +3911,7 @@ "issues": "https://github.com/sabre-io/http/issues", "source": "https://github.com/fruux/sabre-http" }, - "time": "2023-06-26T10:13:00+00:00" + "time": "2023-08-18T01:55:28+00:00" }, { "name": "sabre/uri", @@ -3975,16 +3975,16 @@ }, { "name": "sabre/vobject", - "version": "4.5.3", + "version": "4.5.4", "source": { "type": "git", "url": "https://github.com/sabre-io/vobject.git", - "reference": "fe6d9183154ed6f2f913f2b568d3d51d8ae9b308" + "reference": "a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/vobject/zipball/fe6d9183154ed6f2f913f2b568d3d51d8ae9b308", - "reference": "fe6d9183154ed6f2f913f2b568d3d51d8ae9b308", + "url": "https://api.github.com/repos/sabre-io/vobject/zipball/a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772", + "reference": "a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772", "shasum": "" }, "require": { @@ -4075,7 +4075,7 @@ "issues": "https://github.com/sabre-io/vobject/issues", "source": "https://github.com/fruux/sabre-vobject" }, - "time": "2023-01-22T12:21:50+00:00" + "time": "2023-11-09T12:54:37+00:00" }, { "name": "sabre/xml", diff --git a/composer/installed.json b/composer/installed.json index 9ae004e49..e4ba0cca1 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -4020,17 +4020,17 @@ }, { "name": "sabre/http", - "version": "5.1.7", - "version_normalized": "5.1.7.0", + "version": "5.1.10", + "version_normalized": "5.1.10.0", "source": { "type": "git", "url": "https://github.com/sabre-io/http.git", - "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7" + "reference": "f9f3d1fba8916fa2f4ec25636c4fedc26cb94e02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/http/zipball/b6fa04f42f49156eaab3fb890c79f4c43a9559b7", - "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7", + "url": "https://api.github.com/repos/sabre-io/http/zipball/f9f3d1fba8916fa2f4ec25636c4fedc26cb94e02", + "reference": "f9f3d1fba8916fa2f4ec25636c4fedc26cb94e02", "shasum": "" }, "require": { @@ -4049,7 +4049,7 @@ "suggest": { "ext-curl": " to make http requests with the Client class" }, - "time": "2023-06-26T10:13:00+00:00", + "time": "2023-08-18T01:55:28+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -4149,17 +4149,17 @@ }, { "name": "sabre/vobject", - "version": "4.5.3", - "version_normalized": "4.5.3.0", + "version": "4.5.4", + "version_normalized": "4.5.4.0", "source": { "type": "git", "url": "https://github.com/sabre-io/vobject.git", - "reference": "fe6d9183154ed6f2f913f2b568d3d51d8ae9b308" + "reference": "a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/vobject/zipball/fe6d9183154ed6f2f913f2b568d3d51d8ae9b308", - "reference": "fe6d9183154ed6f2f913f2b568d3d51d8ae9b308", + "url": "https://api.github.com/repos/sabre-io/vobject/zipball/a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772", + "reference": "a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772", "shasum": "" }, "require": { @@ -4176,7 +4176,7 @@ "suggest": { "hoa/bench": "If you would like to run the benchmark scripts" }, - "time": "2023-01-22T12:21:50+00:00", + "time": "2023-11-09T12:54:37+00:00", "bin": [ "bin/vobject", "bin/generate_vcards" diff --git a/composer/installed.php b/composer/installed.php index a360901a7..0838ef0d1 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'nextcloud/3rdparty', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '6e16075d122c7582527e2be7e365775f0b8e5f0c', + 'reference' => 'b735a43181ab32f3d55783d7726589928db23745', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), @@ -310,7 +310,7 @@ 'nextcloud/3rdparty' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '6e16075d122c7582527e2be7e365775f0b8e5f0c', + 'reference' => 'b735a43181ab32f3d55783d7726589928db23745', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), @@ -608,9 +608,9 @@ 'dev_requirement' => false, ), 'sabre/http' => array( - 'pretty_version' => '5.1.7', - 'version' => '5.1.7.0', - 'reference' => 'b6fa04f42f49156eaab3fb890c79f4c43a9559b7', + 'pretty_version' => '5.1.10', + 'version' => '5.1.10.0', + 'reference' => 'f9f3d1fba8916fa2f4ec25636c4fedc26cb94e02', 'type' => 'library', 'install_path' => __DIR__ . '/../sabre/http', 'aliases' => array(), @@ -626,9 +626,9 @@ 'dev_requirement' => false, ), 'sabre/vobject' => array( - 'pretty_version' => '4.5.3', - 'version' => '4.5.3.0', - 'reference' => 'fe6d9183154ed6f2f913f2b568d3d51d8ae9b308', + 'pretty_version' => '4.5.4', + 'version' => '4.5.4.0', + 'reference' => 'a6d53a3e5bec85ed3dd78868b7de0f5b4e12f772', 'type' => 'library', 'install_path' => __DIR__ . '/../sabre/vobject', 'aliases' => array(), diff --git a/sabre/http/lib/Client.php b/sabre/http/lib/Client.php index 2bc7483a7..0837e8d2a 100644 --- a/sabre/http/lib/Client.php +++ b/sabre/http/lib/Client.php @@ -402,7 +402,10 @@ protected function createCurlSettingsArray(RequestInterface $request): array $nHeaders[] = $key.': '.$value; } } - $settings[CURLOPT_HTTPHEADER] = $nHeaders; + + if ([] !== $nHeaders) { + $settings[CURLOPT_HTTPHEADER] = $nHeaders; + } $settings[CURLOPT_URL] = $request->getUrl(); // FIXME: CURLOPT_PROTOCOLS is currently unsupported by HHVM if (defined('CURLOPT_PROTOCOLS')) { diff --git a/sabre/http/lib/Version.php b/sabre/http/lib/Version.php index 1c9190c59..93c64797b 100644 --- a/sabre/http/lib/Version.php +++ b/sabre/http/lib/Version.php @@ -16,5 +16,5 @@ class Version /** * Full version number. */ - const VERSION = '5.1.7'; + const VERSION = '5.1.10'; } diff --git a/sabre/vobject/lib/DateTimeParser.php b/sabre/vobject/lib/DateTimeParser.php index 1c253437a..c5dbac97d 100644 --- a/sabre/vobject/lib/DateTimeParser.php +++ b/sabre/vobject/lib/DateTimeParser.php @@ -104,7 +104,7 @@ public static function parseDuration($duration, $asString = false) if (!$asString) { $invert = false; - if ('-' === $matches['plusminus']) { + if (isset($matches['plusminus']) && '-' === $matches['plusminus']) { $invert = true; } diff --git a/sabre/vobject/lib/ITip/Broker.php b/sabre/vobject/lib/ITip/Broker.php index b66a59f54..80d9a5b31 100644 --- a/sabre/vobject/lib/ITip/Broker.php +++ b/sabre/vobject/lib/ITip/Broker.php @@ -156,9 +156,9 @@ public function processMessage(Message $itipMessage, VCalendar $existingObject = * people. If the user was an attendee, we need to make sure that the * organizer gets the 'declined' message. * - * @param VCalendar|string $calendar - * @param string|array $userHref - * @param VCalendar|string $oldCalendar + * @param VCalendar|string $calendar + * @param string|array $userHref + * @param VCalendar|string|null $oldCalendar * * @return array */ diff --git a/sabre/vobject/lib/Version.php b/sabre/vobject/lib/Version.php index 63349e47e..c7ca69e14 100644 --- a/sabre/vobject/lib/Version.php +++ b/sabre/vobject/lib/Version.php @@ -14,5 +14,5 @@ class Version /** * Full version number. */ - public const VERSION = '4.5.3'; + public const VERSION = '4.5.4'; }