Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions composer.lock

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

12 changes: 6 additions & 6 deletions composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -3980,17 +3980,17 @@
},
{
"name": "sabre/vobject",
"version": "4.4.0",
"version_normalized": "4.4.0.0",
"version": "4.4.1",
"version_normalized": "4.4.1.0",
"source": {
"type": "git",
"url": "https://github.com/sabre-io/vobject.git",
"reference": "0a2e27c797ec0934f376764e1a16567bbbcece0b"
"reference": "06feff370141fd3118609f808e86d9315864bf14"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sabre-io/vobject/zipball/0a2e27c797ec0934f376764e1a16567bbbcece0b",
"reference": "0a2e27c797ec0934f376764e1a16567bbbcece0b",
"url": "https://api.github.com/repos/sabre-io/vobject/zipball/06feff370141fd3118609f808e86d9315864bf14",
"reference": "06feff370141fd3118609f808e86d9315864bf14",
"shasum": ""
},
"require": {
Expand All @@ -4007,7 +4007,7 @@
"suggest": {
"hoa/bench": "If you would like to run the benchmark scripts"
},
"time": "2021-11-16T09:25:03+00:00",
"time": "2021-12-07T09:45:33+00:00",
"bin": [
"bin/vobject",
"bin/generate_vcards"
Expand Down
10 changes: 5 additions & 5 deletions composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => 'f6cbbf593249674d24c195e756437ea8417c1c06',
'reference' => 'f6e3fb0265ac03394420525b26ab7f306ae373d5',
'name' => 'nextcloud/3rdparty',
'dev' => false,
),
Expand Down Expand Up @@ -286,7 +286,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => 'f6cbbf593249674d24c195e756437ea8417c1c06',
'reference' => 'f6e3fb0265ac03394420525b26ab7f306ae373d5',
'dev_requirement' => false,
),
'nextcloud/lognormalizer' => array(
Expand Down Expand Up @@ -608,12 +608,12 @@
'dev_requirement' => false,
),
'sabre/vobject' => array(
'pretty_version' => '4.4.0',
'version' => '4.4.0.0',
'pretty_version' => '4.4.1',
'version' => '4.4.1.0',
'type' => 'library',
'install_path' => __DIR__ . '/../sabre/vobject',
'aliases' => array(),
'reference' => '0a2e27c797ec0934f376764e1a16567bbbcece0b',
'reference' => '06feff370141fd3118609f808e86d9315864bf14',
'dev_requirement' => false,
),
'sabre/xml' => array(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ final class Versions
'sabre/event' => '5.1.4@d7da22897125d34d7eddf7977758191c06a74497',
'sabre/http' => '5.1.3@315f592adfcba8aeb73c2fd64285205747acbbd7',
'sabre/uri' => '2.2.2@7cb0f489578afad5006e85cd60f18ff33f2d440d',
'sabre/vobject' => '4.4.0@0a2e27c797ec0934f376764e1a16567bbbcece0b',
'sabre/vobject' => '4.4.1@06feff370141fd3118609f808e86d9315864bf14',
'sabre/xml' => '2.2.5@a6af111850e7536d200d9637c34885cd3c77a86c',
'scssphp/scssphp' => 'v1.8.1@5e37759a63caf54392a4b709358a39ac7425a69f',
'spomky-labs/base64url' => 'v2.0.4@7752ce931ec285da4ed1f4c5aa27e45e097be61d',
Expand Down Expand Up @@ -120,7 +120,7 @@ final class Versions
'web-auth/cose-lib' => 'v3.3.9@ed172d2dc1a6b87b5c644c07c118cd30c1b3819b',
'web-auth/metadata-service' => 'v3.3.9@8488d3a832a38cc81c670fce05de1e515c6e64b1',
'web-auth/webauthn-lib' => 'v3.3.9@04b98ee3d39cb79dad68a7c15c297c085bf66bfe',
'nextcloud/3rdparty' => 'dev-master@f6cbbf593249674d24c195e756437ea8417c1c06',
'nextcloud/3rdparty' => 'dev-master@f6e3fb0265ac03394420525b26ab7f306ae373d5',
);

private function __construct()
Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/Parser/MimeDir.php
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ protected function readProperty($line)
*
* Now for the parameters
*
* If delimiter is not set (null) this method will just return a string.
* If delimiter is not set (empty string) this method will just return a string.
* If it's a comma or a semi-colon the string will be split on those
* characters, and always return an array.
*
Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/Property.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ abstract class Property extends Node
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = ';';

Expand Down
4 changes: 2 additions & 2 deletions sabre/vobject/lib/Property/Binary.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class Binary extends Property
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = null;
public $delimiter = '';

/**
* Updates the current value.
Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/Property/FloatValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class FloatValue extends Property
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = ';';

Expand Down
4 changes: 2 additions & 2 deletions sabre/vobject/lib/Property/ICalendar/CalAddress.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class CalAddress extends Text
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = null;
public $delimiter = '';

/**
* Returns the type of value.
Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/Property/ICalendar/Duration.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Duration extends Property
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = ',';

Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/Property/ICalendar/Period.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Period extends Property
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = ',';

Expand Down
4 changes: 2 additions & 2 deletions sabre/vobject/lib/Property/Time.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class Time extends Text
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = null;
public $delimiter = '';

/**
* Returns the type of value.
Expand Down
4 changes: 2 additions & 2 deletions sabre/vobject/lib/Property/Uri.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ class Uri extends Text
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = null;
public $delimiter = '';

/**
* Returns the type of value.
Expand Down
4 changes: 2 additions & 2 deletions sabre/vobject/lib/Property/UtcOffset.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ class UtcOffset extends Text
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = null;
public $delimiter = '';

/**
* Returns the type of value.
Expand Down
4 changes: 2 additions & 2 deletions sabre/vobject/lib/Property/VCard/DateAndOrTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class DateAndOrTime extends Property
/**
* Field separator.
*
* @var string|null
* @var string
*/
public $delimiter = null;
public $delimiter = '';

/**
* Returns the type of value.
Expand Down
4 changes: 2 additions & 2 deletions sabre/vobject/lib/Property/VCard/TimeStamp.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class TimeStamp extends Text
* In case this is a multi-value property. This string will be used as a
* delimiter.
*
* @var string|null
* @var string
*/
public $delimiter = null;
public $delimiter = '';

/**
* Returns the type of value.
Expand Down
9 changes: 9 additions & 0 deletions sabre/vobject/lib/Recur/EventIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ public function __construct($input, $uid = null, DateTimeZone $timeZone = null)
*
* @return DateTimeImmutable
*/
#[\ReturnTypeWillChange]
public function current()
{
if ($this->currentDate) {
Expand Down Expand Up @@ -285,6 +286,7 @@ public function getEventObject()
*
* @return int
*/
#[\ReturnTypeWillChange]
public function key()
{
// The counter is always 1 ahead.
Expand All @@ -297,6 +299,7 @@ public function key()
*
* @return bool
*/
#[\ReturnTypeWillChange]
public function valid()
{
if ($this->counter > Settings::$maxRecurrences && -1 !== Settings::$maxRecurrences) {
Expand All @@ -308,7 +311,10 @@ public function valid()

/**
* Sets the iterator back to the starting point.
*
* @return void
*/
#[\ReturnTypeWillChange]
public function rewind()
{
$this->recurIterator->rewind();
Expand All @@ -331,7 +337,10 @@ public function rewind()

/**
* Advances the iterator with one step.
*
* @return void
*/
#[\ReturnTypeWillChange]
public function next()
{
$this->currentOverriddenEvent = null;
Expand Down
9 changes: 9 additions & 0 deletions sabre/vobject/lib/Recur/RDateIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public function __construct($rrule, DateTimeInterface $start)

/* Implementation of the Iterator interface {{{ */

#[\ReturnTypeWillChange]
public function current()
{
if (!$this->valid()) {
Expand All @@ -49,6 +50,7 @@ public function current()
*
* @return int
*/
#[\ReturnTypeWillChange]
public function key()
{
return $this->counter;
Expand All @@ -60,14 +62,18 @@ public function key()
*
* @return bool
*/
#[\ReturnTypeWillChange]
public function valid()
{
return $this->counter <= count($this->dates);
}

/**
* Resets the iterator.
*
* @return void
*/
#[\ReturnTypeWillChange]
public function rewind()
{
$this->currentDate = clone $this->startDate;
Expand All @@ -76,7 +82,10 @@ public function rewind()

/**
* Goes on to the next iteration.
*
* @return void
*/
#[\ReturnTypeWillChange]
public function next()
{
++$this->counter;
Expand Down
9 changes: 9 additions & 0 deletions sabre/vobject/lib/Recur/RRuleIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public function __construct($rrule, DateTimeInterface $start)

/* Implementation of the Iterator interface {{{ */

#[\ReturnTypeWillChange]
public function current()
{
if (!$this->valid()) {
Expand All @@ -52,6 +53,7 @@ public function current()
*
* @return int
*/
#[\ReturnTypeWillChange]
public function key()
{
return $this->counter;
Expand All @@ -64,6 +66,7 @@ public function key()
*
* @return bool
*/
#[\ReturnTypeWillChange]
public function valid()
{
if (null === $this->currentDate) {
Expand All @@ -78,7 +81,10 @@ public function valid()

/**
* Resets the iterator.
*
* @return void
*/
#[\ReturnTypeWillChange]
public function rewind()
{
$this->currentDate = clone $this->startDate;
Expand All @@ -87,7 +93,10 @@ public function rewind()

/**
* Goes on to the next iteration.
*
* @return void
*/
#[\ReturnTypeWillChange]
public function next()
{
// Otherwise, we find the next event in the normal RRULE
Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ class Version
/**
* Full version number.
*/
const VERSION = '4.4.0';
const VERSION = '4.4.1';
}