Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update sabre/vobject and sabre/event to latest minor #1641

Merged
merged 1 commit into from
Nov 13, 2023
Merged

chore: update sabre/vobject and sabre/event to latest minor #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand All @@ -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(),
Expand Down
5 changes: 4 additions & 1 deletion sabre/http/lib/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down
2 changes: 1 addition & 1 deletion sabre/http/lib/Version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ class Version
/**
* Full version number.
*/
const VERSION = '5.1.7';
const VERSION = '5.1.10';
}
2 changes: 1 addition & 1 deletion sabre/vobject/lib/DateTimeParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions sabre/vobject/lib/ITip/Broker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/Version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ class Version
/**
* Full version number.
*/
public const VERSION = '4.5.3';
public const VERSION = '4.5.4';
}