From fae70bf0a7f1b566d25e30064f60d58ab150951a Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 7 May 2020 23:35:02 +0200 Subject: Revert "composer updates" This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00 --- vendor/sabre/vobject/lib/Recur/EventIterator.php | 2 ++ .../sabre/vobject/lib/Recur/NoInstancesException.php | 2 +- vendor/sabre/vobject/lib/Recur/RDateIterator.php | 5 ++++- vendor/sabre/vobject/lib/Recur/RRuleIterator.php | 18 +++++++----------- 4 files changed, 14 insertions(+), 13 deletions(-) (limited to 'vendor/sabre/vobject/lib/Recur') diff --git a/vendor/sabre/vobject/lib/Recur/EventIterator.php b/vendor/sabre/vobject/lib/Recur/EventIterator.php index fd904b383..135ecf00e 100644 --- a/vendor/sabre/vobject/lib/Recur/EventIterator.php +++ b/vendor/sabre/vobject/lib/Recur/EventIterator.php @@ -380,6 +380,8 @@ class EventIterator implements \Iterator /** * Quickly jump to a date in the future. + * + * @param DateTimeInterface $dateTime */ public function fastForward(DateTimeInterface $dateTime) { diff --git a/vendor/sabre/vobject/lib/Recur/NoInstancesException.php b/vendor/sabre/vobject/lib/Recur/NoInstancesException.php index 348c02306..b55af567d 100644 --- a/vendor/sabre/vobject/lib/Recur/NoInstancesException.php +++ b/vendor/sabre/vobject/lib/Recur/NoInstancesException.php @@ -7,7 +7,7 @@ use Exception; /** * This exception gets thrown when a recurrence iterator produces 0 instances. * - * This may happen when every occurrence in a rrule is also in EXDATE. + * This may happen when every occurence in a rrule is also in EXDATE. * * @copyright Copyright (C) fruux GmbH (https://fruux.com/) * @author Evert Pot (http://evertpot.com/) diff --git a/vendor/sabre/vobject/lib/Recur/RDateIterator.php b/vendor/sabre/vobject/lib/Recur/RDateIterator.php index d117e152c..013694b95 100644 --- a/vendor/sabre/vobject/lib/Recur/RDateIterator.php +++ b/vendor/sabre/vobject/lib/Recur/RDateIterator.php @@ -24,7 +24,8 @@ class RDateIterator implements Iterator /** * Creates the Iterator. * - * @param string|array $rrule + * @param string|array $rrule + * @param DateTimeInterface $start */ public function __construct($rrule, DateTimeInterface $start) { @@ -106,6 +107,8 @@ class RDateIterator implements Iterator /** * This method allows you to quickly go to the next occurrence after the * specified date. + * + * @param DateTimeInterface $dt */ public function fastForward(DateTimeInterface $dt) { diff --git a/vendor/sabre/vobject/lib/Recur/RRuleIterator.php b/vendor/sabre/vobject/lib/Recur/RRuleIterator.php index 55581e9ac..75342a2a8 100644 --- a/vendor/sabre/vobject/lib/Recur/RRuleIterator.php +++ b/vendor/sabre/vobject/lib/Recur/RRuleIterator.php @@ -27,7 +27,8 @@ class RRuleIterator implements Iterator /** * Creates the Iterator. * - * @param string|array $rrule + * @param string|array $rrule + * @param DateTimeInterface $start */ public function __construct($rrule, DateTimeInterface $start) { @@ -131,6 +132,8 @@ class RRuleIterator implements Iterator /** * This method allows you to quickly go to the next occurrence after the * specified date. + * + * @param DateTimeInterface $dt */ public function fastForward(DateTimeInterface $dt) { @@ -229,7 +232,7 @@ class RRuleIterator implements Iterator * * This is an array of weekdays * - * This may also be preceded by a positive or negative integer. If present, + * This may also be preceeded by a positive or negative integer. If present, * this indicates the nth occurrence of a specific day within the monthly or * yearly rrule. For instance, -2TU indicates the second-last tuesday of * the month, or year. @@ -322,17 +325,14 @@ class RRuleIterator implements Iterator return; } - $recurrenceHours = []; if (!empty($this->byHour)) { $recurrenceHours = $this->getHours(); } - $recurrenceDays = []; if (!empty($this->byDay)) { $recurrenceDays = $this->getDays(); } - $recurrenceMonths = []; if (!empty($this->byMonth)) { $recurrenceMonths = $this->getMonths(); } @@ -375,12 +375,10 @@ class RRuleIterator implements Iterator return; } - $recurrenceHours = []; if ($this->byHour) { $recurrenceHours = $this->getHours(); } - $recurrenceDays = []; if ($this->byDay) { $recurrenceDays = $this->getDays(); } @@ -441,7 +439,6 @@ class RRuleIterator implements Iterator return; } - $occurrence = -1; while (true) { $occurrences = $this->getMonthlyOccurrences(); @@ -611,7 +608,6 @@ class RRuleIterator implements Iterator // If we got a byDay or getMonthDay filter, we must first expand // further. if ($this->byDay || $this->byMonthDay) { - $occurrence = -1; while (true) { $occurrences = $this->getMonthlyOccurrences(); @@ -775,7 +771,7 @@ class RRuleIterator implements Iterator $this->byMonth = (array) $value; foreach ($this->byMonth as $byMonth) { if (!is_numeric($byMonth) || (int) $byMonth < 1 || (int) $byMonth > 12) { - throw new InvalidDataException('BYMONTH in RRULE must have value(s) between 1 and 12!'); + throw new InvalidDataException('BYMONTH in RRULE must have value(s) betweeen 1 and 12!'); } } break; @@ -952,7 +948,7 @@ class RRuleIterator implements Iterator { $recurrenceDays = []; foreach ($this->byDay as $byDay) { - // The day may be preceded with a positive (+n) or + // The day may be preceeded with a positive (+n) or // negative (-n) integer. However, this does not make // sense in 'weekly' so we ignore it here. $recurrenceDays[] = $this->dayMap[substr($byDay, -2)]; -- cgit v1.2.3