Merge pull request #947 from nextcloud/fix/bump-sabre/vobject-to-4.4.1

Bump sabre/vobject to 4.4.1
nextcloud · Dec 20, 2021 · 4921806 · 4921806
2 parents f6e3fb0 + 3ffd8c6
commit 4921806
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 38 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer/installed.json b/composer/installed.json
@@ -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": {
@@ -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"

diff --git a/composer/installed.php b/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
-        'reference' => 'f6cbbf593249674d24c195e756437ea8417c1c06',
+        'reference' => 'f6e3fb0265ac03394420525b26ab7f306ae373d5',
         'name' => 'nextcloud/3rdparty',
         'dev' => false,
     ),
@@ -286,7 +286,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
-            'reference' => 'f6cbbf593249674d24c195e756437ea8417c1c06',
+            'reference' => 'f6e3fb0265ac03394420525b26ab7f306ae373d5',
             'dev_requirement' => false,
         ),
         'nextcloud/lognormalizer' => array(
@@ -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(

diff --git a/composer/package-versions-deprecated/src/PackageVersions/Versions.php b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
@@ -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',
@@ -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()

diff --git a/sabre/vobject/lib/Parser/MimeDir.php b/sabre/vobject/lib/Parser/MimeDir.php
@@ -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.
      *

diff --git a/sabre/vobject/lib/Property.php b/sabre/vobject/lib/Property.php
@@ -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 = ';';
 

diff --git a/sabre/vobject/lib/Property/Binary.php b/sabre/vobject/lib/Property/Binary.php
@@ -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.

diff --git a/sabre/vobject/lib/Property/FloatValue.php b/sabre/vobject/lib/Property/FloatValue.php
@@ -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 = ';';
 

diff --git a/sabre/vobject/lib/Property/ICalendar/CalAddress.php b/sabre/vobject/lib/Property/ICalendar/CalAddress.php
@@ -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.

diff --git a/sabre/vobject/lib/Property/ICalendar/Duration.php b/sabre/vobject/lib/Property/ICalendar/Duration.php
@@ -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 = ',';
 

diff --git a/sabre/vobject/lib/Property/ICalendar/Period.php b/sabre/vobject/lib/Property/ICalendar/Period.php
@@ -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 = ',';
 

diff --git a/sabre/vobject/lib/Property/Time.php b/sabre/vobject/lib/Property/Time.php
@@ -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.

diff --git a/sabre/vobject/lib/Property/Uri.php b/sabre/vobject/lib/Property/Uri.php
@@ -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.

diff --git a/sabre/vobject/lib/Property/UtcOffset.php b/sabre/vobject/lib/Property/UtcOffset.php
@@ -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.

diff --git a/sabre/vobject/lib/Property/VCard/DateAndOrTime.php b/sabre/vobject/lib/Property/VCard/DateAndOrTime.php
@@ -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.

diff --git a/sabre/vobject/lib/Property/VCard/TimeStamp.php b/sabre/vobject/lib/Property/VCard/TimeStamp.php
@@ -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.

diff --git a/sabre/vobject/lib/Recur/EventIterator.php b/sabre/vobject/lib/Recur/EventIterator.php
@@ -198,6 +198,7 @@ public function __construct($input, $uid = null, DateTimeZone $timeZone = null)
      *
      * @return DateTimeImmutable
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         if ($this->currentDate) {
@@ -285,6 +286,7 @@ public function getEventObject()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         // The counter is always 1 ahead.
@@ -297,6 +299,7 @@ public function key()
      *
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         if ($this->counter > Settings::$maxRecurrences && -1 !== Settings::$maxRecurrences) {
@@ -308,7 +311,10 @@ public function valid()
 
     /**
      * Sets the iterator back to the starting point.
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->recurIterator->rewind();
@@ -331,7 +337,10 @@ public function rewind()
 
     /**
      * Advances the iterator with one step.
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         $this->currentOverriddenEvent = null;

diff --git a/sabre/vobject/lib/Recur/RDateIterator.php b/sabre/vobject/lib/Recur/RDateIterator.php
@@ -35,6 +35,7 @@ public function __construct($rrule, DateTimeInterface $start)
 
     /* Implementation of the Iterator interface {{{ */
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         if (!$this->valid()) {
@@ -49,6 +50,7 @@ public function current()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->counter;
@@ -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;
@@ -76,7 +82,10 @@ public function rewind()
 
     /**
      * Goes on to the next iteration.
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         ++$this->counter;

diff --git a/sabre/vobject/lib/Recur/RRuleIterator.php b/sabre/vobject/lib/Recur/RRuleIterator.php
@@ -38,6 +38,7 @@ public function __construct($rrule, DateTimeInterface $start)
 
     /* Implementation of the Iterator interface {{{ */
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         if (!$this->valid()) {
@@ -52,6 +53,7 @@ public function current()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->counter;
@@ -64,6 +66,7 @@ public function key()
      *
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         if (null === $this->currentDate) {
@@ -78,7 +81,10 @@ public function valid()
 
     /**
      * Resets the iterator.
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->currentDate = clone $this->startDate;
@@ -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

diff --git a/sabre/vobject/lib/Version.php b/sabre/vobject/lib/Version.php
@@ -14,5 +14,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '4.4.0';
+    const VERSION = '4.4.1';
 }