Merge branch '5.4RC'5.4

17 files changed, 42 insertions, 43 deletions

diff --git a/vendor/sabre/vobject/lib/Cli.php b/vendor/sabre/vobject/lib/Cli.php
index f3e419b15..4984ac9b2 100644
--- a/vendor/sabre/vobject/lib/Cli.php
+++ b/vendor/sabre/vobject/lib/Cli.php
@@ -2,8 +2,7 @@
 
 namespace Sabre\VObject;
 
-use
-    InvalidArgumentException;
+use InvalidArgumentException;
 
 /**
  * This is the CLI interface for sabre-vobject.
@@ -137,17 +136,14 @@ class Cli
                             // jcard/jcal documents
                             case 'jcard':
                             case 'jcal':
-
                             // specific document versions
                             case 'vcard21':
                             case 'vcard30':
                             case 'vcard40':
                             case 'icalendar20':
-
                             // specific formats
                             case 'json':
                             case 'mimedir':
-
                             // icalendar/vcad
                             case 'icalendar':
                             case 'vcard':
@@ -183,7 +179,6 @@ class Cli
                             case 'vcard30':
                             case 'vcard40':
                             case 'icalendar20':
-
                                 $this->inputFormat = 'mimedir';
                                 break;
 
@@ -211,7 +206,7 @@ class Cli
             }
 
             if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
-                throw new InvalidArgumentException('Uknown command: '.$positional[0]);
+                throw new InvalidArgumentException('Unknown command: '.$positional[0]);
             }
         } catch (InvalidArgumentException $e) {
             $this->showHelp();
diff --git a/vendor/sabre/vobject/lib/Component.php b/vendor/sabre/vobject/lib/Component.php
index da45eb29f..07f6a627f 100644
--- a/vendor/sabre/vobject/lib/Component.php
+++ b/vendor/sabre/vobject/lib/Component.php
@@ -160,9 +160,9 @@ class Component extends Node
                     return;
                 }
             }
-        }
 
-        throw new \InvalidArgumentException('The item you passed to remove() was not a child of this component');
+            throw new \InvalidArgumentException('The item you passed to remove() was not a child of this component');
+        }
     }
 
     /**
diff --git a/vendor/sabre/vobject/lib/Component/VCalendar.php b/vendor/sabre/vobject/lib/Component/VCalendar.php
index 40e09a1c0..4db318135 100644
--- a/vendor/sabre/vobject/lib/Component/VCalendar.php
+++ b/vendor/sabre/vobject/lib/Component/VCalendar.php
@@ -309,7 +309,7 @@ class VCalendar extends VObject\Document
 
         foreach ($this->children() as $child) {
             if ($child instanceof Property && 'PRODID' !== $child->name) {
-                // We explictly want to ignore PRODID, because we want to
+                // We explicitly want to ignore PRODID, because we want to
                 // overwrite it with our own.
                 $newChildren[] = clone $child;
             } elseif ($child instanceof Component && 'VTIMEZONE' !== $child->name) {
diff --git a/vendor/sabre/vobject/lib/Component/VCard.php b/vendor/sabre/vobject/lib/Component/VCard.php
index 51321949f..2430df621 100644
--- a/vendor/sabre/vobject/lib/Component/VCard.php
+++ b/vendor/sabre/vobject/lib/Component/VCard.php
@@ -373,7 +373,7 @@ class VCard extends VObject\Document
     /**
      * Returns a preferred field.
      *
-     * VCards can indicate wether a field such as ADR, TEL or EMAIL is
+     * VCards can indicate whether a field such as ADR, TEL or EMAIL is
      * preferred by specifying TYPE=PREF (vcard 2.1, 3) or PREF=x (vcard 4, x
      * being a number between 1 and 100).
      *
diff --git a/vendor/sabre/vobject/lib/FreeBusyData.php b/vendor/sabre/vobject/lib/FreeBusyData.php
index d05dfc799..4d9f441ce 100644
--- a/vendor/sabre/vobject/lib/FreeBusyData.php
+++ b/vendor/sabre/vobject/lib/FreeBusyData.php
@@ -84,7 +84,7 @@ class FreeBusyData
             'type' => $type,
         ];
 
-        $preceedingItem = $this->data[$insertStartIndex - 1];
+        $precedingItem = $this->data[$insertStartIndex - 1];
         if ($this->data[$insertStartIndex - 1]['start'] === $start) {
             // The old item starts at the exact same point as the new item.
             --$insertStartIndex;
@@ -122,11 +122,11 @@ class FreeBusyData
         // between.
         if (-1 === $itemsToDelete) {
             $itemsToDelete = 0;
-            if ($newItem['end'] < $preceedingItem['end']) {
+            if ($newItem['end'] < $precedingItem['end']) {
                 $newItems[] = [
                     'start' => $newItem['end'] + 1,
-                    'end' => $preceedingItem['end'],
-                    'type' => $preceedingItem['type'],
+                    'end' => $precedingItem['end'],
+                    'type' => $precedingItem['type'],
                 ];
             }
         }
diff --git a/vendor/sabre/vobject/lib/FreeBusyGenerator.php b/vendor/sabre/vobject/lib/FreeBusyGenerator.php
index a1c24044c..81b8126d5 100644
--- a/vendor/sabre/vobject/lib/FreeBusyGenerator.php
+++ b/vendor/sabre/vobject/lib/FreeBusyGenerator.php
@@ -126,7 +126,7 @@ class FreeBusyGenerator
     /**
      * Sets the input objects.
      *
-     * You must either specify a valendar object as a string, or as the parse
+     * You must either specify a vcalendar object as a string, or as the parse
      * Component.
      * It's also possible to specify multiple objects as an array.
      *
@@ -362,7 +362,6 @@ class FreeBusyGenerator
             foreach ($object->getBaseComponents() as $component) {
                 switch ($component->name) {
                     case 'VEVENT':
-
                         $FBTYPE = 'BUSY';
                         if (isset($component->TRANSP) && ('TRANSPARENT' === strtoupper($component->TRANSP))) {
                             break;
diff --git a/vendor/sabre/vobject/lib/Parameter.php b/vendor/sabre/vobject/lib/Parameter.php
index e39d320a1..72f2ecbcb 100644
--- a/vendor/sabre/vobject/lib/Parameter.php
+++ b/vendor/sabre/vobject/lib/Parameter.php
@@ -95,13 +95,11 @@ class Parameter extends Node
             case 'WORK':
             case 'HOME':
             case 'PREF':
-
             // Delivery Label Type
             case 'DOM':
             case 'INTL':
             case 'POSTAL':
             case 'PARCEL':
-
             // Telephone types
             case 'VOICE':
             case 'FAX':
@@ -113,7 +111,6 @@ class Parameter extends Node
             case 'CAR':
             case 'ISDN':
             case 'VIDEO':
-
             // EMAIL types (lol)
             case 'AOL':
             case 'APPLELINK':
@@ -127,7 +124,6 @@ class Parameter extends Node
             case 'PRODIGY':
             case 'TLX':
             case 'X400':
-
             // Photo / Logo format types
             case 'GIF':
             case 'CGM':
@@ -143,12 +139,10 @@ class Parameter extends Node
             case 'MPEG2':
             case 'AVI':
             case 'QTIME':
-
             // Sound Digital Audio Type
             case 'WAVE':
             case 'PCM':
             case 'AIFF':
-
             // Key types
             case 'X509':
             case 'PGP':
@@ -299,7 +293,7 @@ class Parameter extends Node
                 // https://tools.ietf.org/html/rfc6868
                 //
                 // But we've found that iCal (7.0, shipped with OSX 10.9)
-                // severaly trips on + characters not being quoted, so we
+                // severely trips on + characters not being quoted, so we
                 // added + as well.
                 if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
                     return $out.$item;
diff --git a/vendor/sabre/vobject/lib/Parser/MimeDir.php b/vendor/sabre/vobject/lib/Parser/MimeDir.php
index ea5ac0326..385d340d7 100644
--- a/vendor/sabre/vobject/lib/Parser/MimeDir.php
+++ b/vendor/sabre/vobject/lib/Parser/MimeDir.php
@@ -343,7 +343,7 @@ class MimeDir extends Parser
             ) (?=[;:,])
             /xi";
 
-        //echo $regex, "\n"; die();
+        //echo $regex, "\n"; exit();
         preg_match_all($regex, $line, $matches, PREG_SET_ORDER);
 
         $property = [
diff --git a/vendor/sabre/vobject/lib/Property/Boolean.php b/vendor/sabre/vobject/lib/Property/Boolean.php
index 9fb2bce35..4bd6ffdfe 100644
--- a/vendor/sabre/vobject/lib/Property/Boolean.php
+++ b/vendor/sabre/vobject/lib/Property/Boolean.php
@@ -2,8 +2,7 @@
 
 namespace Sabre\VObject\Property;
 
-use
-    Sabre\VObject\Property;
+use Sabre\VObject\Property;
 
 /**
  * Boolean property.
diff --git a/vendor/sabre/vobject/lib/Property/ICalendar/CalAddress.php b/vendor/sabre/vobject/lib/Property/ICalendar/CalAddress.php
index e89bb31f9..86be66c15 100644
--- a/vendor/sabre/vobject/lib/Property/ICalendar/CalAddress.php
+++ b/vendor/sabre/vobject/lib/Property/ICalendar/CalAddress.php
@@ -2,8 +2,7 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
-use
-    Sabre\VObject\Property\Text;
+use Sabre\VObject\Property\Text;
 
 /**
  * CalAddress property.
diff --git a/vendor/sabre/vobject/lib/Property/ICalendar/DateTime.php b/vendor/sabre/vobject/lib/Property/ICalendar/DateTime.php
index f2dbdeba3..d635e17ae 100644
--- a/vendor/sabre/vobject/lib/Property/ICalendar/DateTime.php
+++ b/vendor/sabre/vobject/lib/Property/ICalendar/DateTime.php
@@ -184,7 +184,7 @@ class DateTime extends Property
      * Sets the property as multiple date-time objects.
      *
      * The first value will be used as a reference for the timezones, and all
-     * the otehr values will be adjusted for that timezone
+     * the other values will be adjusted for that timezone
      *
      * @param DateTimeInterface[] $dt
      * @param bool isFloating If set to true, timezones will be ignored
diff --git a/vendor/sabre/vobject/lib/Property/IntegerValue.php b/vendor/sabre/vobject/lib/Property/IntegerValue.php
index 6f709bfff..3ae775214 100644
--- a/vendor/sabre/vobject/lib/Property/IntegerValue.php
+++ b/vendor/sabre/vobject/lib/Property/IntegerValue.php
@@ -2,8 +2,7 @@
 
 namespace Sabre\VObject\Property;
 
-use
-    Sabre\VObject\Property;
+use Sabre\VObject\Property;
 
 /**
  * Integer property.
diff --git a/vendor/sabre/vobject/lib/Property/VCard/LanguageTag.php b/vendor/sabre/vobject/lib/Property/VCard/LanguageTag.php
index 697273989..318ea0231 100644
--- a/vendor/sabre/vobject/lib/Property/VCard/LanguageTag.php
+++ b/vendor/sabre/vobject/lib/Property/VCard/LanguageTag.php
@@ -2,8 +2,7 @@
 
 namespace Sabre\VObject\Property\VCard;
 
-use
-    Sabre\VObject\Property;
+use Sabre\VObject\Property;
 
 /**
  * LanguageTag property.
diff --git a/vendor/sabre/vobject/lib/Recur/EventIterator.php b/vendor/sabre/vobject/lib/Recur/EventIterator.php
index fd904b383..e42ca1360 100644
--- a/vendor/sabre/vobject/lib/Recur/EventIterator.php
+++ b/vendor/sabre/vobject/lib/Recur/EventIterator.php
@@ -83,7 +83,7 @@ class EventIterator implements \Iterator
      * 2. You can pass an array of VEVENTs (all UIDS should match).
      * 3. You can pass a single VEVENT component.
      *
-     * Only the second method is recomended. The other 1 and 3 will be removed
+     * Only the second method is recommended. The other 1 and 3 will be removed
      * at some point in the future.
      *
      * The $uid parameter is only required for the first method.
diff --git a/vendor/sabre/vobject/lib/Recur/RRuleIterator.php b/vendor/sabre/vobject/lib/Recur/RRuleIterator.php
index 55581e9ac..0511f0ade 100644
--- a/vendor/sabre/vobject/lib/Recur/RRuleIterator.php
+++ b/vendor/sabre/vobject/lib/Recur/RRuleIterator.php
@@ -468,6 +468,13 @@ class RRuleIterator implements Iterator
             // beginning.
             $currentDayOfMonth = 0;
 
+            // For some reason the "until" parameter was not being used here,
+            // that's why the workaround of the 10000 year bug was needed at all
+            // let's stop it before the "until" parameter date
+            if ($this->until && $this->currentDate->getTimestamp() >= $this->until->getTimestamp()) {
+                return;
+            }
+
             // To prevent running this forever (better: until we hit the max date of DateTimeImmutable) we simply
             // stop at 9999-12-31. Looks like the year 10000 problem is not solved in php ....
             if ($this->currentDate->getTimestamp() > 253402300799) {
@@ -536,7 +543,7 @@ class RRuleIterator implements Iterator
                     foreach ($this->byWeekNo as $byWeekNo) {
                         foreach ($dayOffsets as $dayOffset) {
                             $date = clone $this->currentDate;
-                            $date->setISODate($currentYear, $byWeekNo, $dayOffset);
+                            $date = $date->setISODate($currentYear, $byWeekNo, $dayOffset);
 
                             if ($date > $this->currentDate) {
                                 $checkDates[] = $date;
@@ -717,7 +724,6 @@ class RRuleIterator implements Iterator
                     break;
 
                 case 'INTERVAL':
-
                 case 'COUNT':
                     $val = (int) $value;
                     if ($val < 1) {
@@ -877,7 +883,7 @@ class RRuleIterator implements Iterator
             foreach ($this->byMonthDay as $monthDay) {
                 // Removing values that are out of range for this month
                 if ($monthDay > $startDate->format('t') ||
-                $monthDay < 0 - $startDate->format('t')) {
+                    $monthDay < 0 - $startDate->format('t')) {
                     continue;
                 }
                 if ($monthDay > 0) {
diff --git a/vendor/sabre/vobject/lib/Version.php b/vendor/sabre/vobject/lib/Version.php
index 29ba84f88..63452400f 100644
--- a/vendor/sabre/vobject/lib/Version.php
+++ b/vendor/sabre/vobject/lib/Version.php
@@ -14,5 +14,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '4.3.3';
+    const VERSION = '4.3.5';
 }
diff --git a/vendor/sabre/vobject/lib/timezonedata/windowszones.php b/vendor/sabre/vobject/lib/timezonedata/windowszones.php
index af3904b12..2049a95c1 100644
--- a/vendor/sabre/vobject/lib/timezonedata/windowszones.php
+++ b/vendor/sabre/vobject/lib/timezonedata/windowszones.php
@@ -3,14 +3,14 @@
 /**
  * Automatically generated timezone file.
  *
- * Last update: 2016-08-24T17:35:38-04:00
- * Source: http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml
+ * Last update: 2020-12-13T17:38:12+05:45
+ * Source: https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml
  *
- * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/).
  * @license http://sabre.io/license/ Modified BSD License
  */
 
-return  [
+return [
   'AUS Central Standard Time' => 'Australia/Darwin',
   'AUS Eastern Standard Time' => 'Australia/Sydney',
   'Afghanistan Standard Time' => 'Asia/Kabul',
@@ -74,6 +74,7 @@ return  [
   'Line Islands Standard Time' => 'Pacific/Kiritimati',
   'Lord Howe Standard Time' => 'Australia/Lord_Howe',
   'Magadan Standard Time' => 'Asia/Magadan',
+  'Magallanes Standard Time' => 'America/Punta_Arenas',
   'Marquesas Standard Time' => 'Pacific/Marquesas',
   'Mauritius Standard Time' => 'Indian/Mauritius',
   'Middle East Standard Time' => 'Asia/Beirut',
@@ -91,11 +92,13 @@ return  [
   'North Asia East Standard Time' => 'Asia/Irkutsk',
   'North Asia Standard Time' => 'Asia/Krasnoyarsk',
   'North Korea Standard Time' => 'Asia/Pyongyang',
+  'Omsk Standard Time' => 'Asia/Omsk',
   'Pacific SA Standard Time' => 'America/Santiago',
   'Pacific Standard Time' => 'America/Los_Angeles',
   'Pacific Standard Time (Mexico)' => 'America/Tijuana',
   'Pakistan Standard Time' => 'Asia/Karachi',
   'Paraguay Standard Time' => 'America/Asuncion',
+  'Qyzylorda Standard Time' => 'Asia/Qyzylorda',
   'Romance Standard Time' => 'Europe/Paris',
   'Russia Time Zone 10' => 'Asia/Srednekolymsk',
   'Russia Time Zone 11' => 'Asia/Kamchatka',
@@ -108,9 +111,12 @@ return  [
   'Saint Pierre Standard Time' => 'America/Miquelon',
   'Sakhalin Standard Time' => 'Asia/Sakhalin',
   'Samoa Standard Time' => 'Pacific/Apia',
+  'Sao Tome Standard Time' => 'Africa/Sao_Tome',
+  'Saratov Standard Time' => 'Europe/Saratov',
   'Singapore Standard Time' => 'Asia/Singapore',
   'South Africa Standard Time' => 'Africa/Johannesburg',
   'Sri Lanka Standard Time' => 'Asia/Colombo',
+  'Sudan Standard Time' => 'Africa/Khartoum',
   'Syria Standard Time' => 'Asia/Damascus',
   'Taipei Standard Time' => 'Asia/Taipei',
   'Tasmania Standard Time' => 'Australia/Hobart',
@@ -125,6 +131,7 @@ return  [
   'US Mountain Standard Time' => 'America/Phoenix',
   'UTC' => 'Etc/GMT',
   'UTC+12' => 'Etc/GMT-12',
+  'UTC+13' => 'Etc/GMT-13',
   'UTC-02' => 'Etc/GMT+2',
   'UTC-08' => 'Etc/GMT+8',
   'UTC-09' => 'Etc/GMT+9',
@@ -132,6 +139,7 @@ return  [
   'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
   'Venezuela Standard Time' => 'America/Caracas',
   'Vladivostok Standard Time' => 'Asia/Vladivostok',
+  'Volgograd Standard Time' => 'Europe/Volgograd',
   'W. Australia Standard Time' => 'Australia/Perth',
   'W. Central Africa Standard Time' => 'Africa/Lagos',
   'W. Europe Standard Time' => 'Europe/Berlin',
@@ -140,4 +148,5 @@ return  [
   'West Bank Standard Time' => 'Asia/Hebron',
   'West Pacific Standard Time' => 'Pacific/Port_Moresby',
   'Yakutsk Standard Time' => 'Asia/Yakutsk',
+  'Yukon Standard Time' => 'America/Whitehorse',
 ];