ProtonMail · valentinbonneaud · Dec 15, 2021 · Oct 9, 2019 · Oct 9, 2019 · Oct 9, 2019
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.4', '8.0']
+        php-versions: ['7.4', '8.0', '8.1']
 
     runs-on: ${{ matrix.operating-system }}
 

diff --git a/.gitignore b/.gitignore
@@ -5,23 +5,5 @@ tests/cov/
 tests/temp
 tests/.phpunit.result.cache
 
-#vim
-.*.swp
-
-#binaries
-bin/phpunit
-bin/phpcs
-bin/php-cs-fixer
-bin/sabre-cs-fixer
-bin/hoa
-
-# Development stuff
-.php_cs.cache
-.idea
-
-# OS X
-.DS_Store
-=======
-
 # Development stuff
 .php_cs.cache
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -6,8 +6,7 @@ $config->getFinder()
     ->in(__DIR__);
 $config->setRules([
     '@PSR1' => true,
-    '@Symfony' => true,
-    'phpdoc_summary' => false
+    '@Symfony' => true
 ]);
 
 return $config;
diff --git a/.travis.yml b/.travis.yml
diff --git a/lib/Parser/MimeDir.php b/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/lib/Property.php b/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/lib/Property/Binary.php b/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/lib/Property/FloatValue.php b/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/lib/Property/ICalendar/CalAddress.php b/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/lib/Property/ICalendar/Duration.php b/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/lib/Property/ICalendar/Period.php b/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/lib/Property/Time.php b/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/lib/Property/Uri.php b/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/lib/Property/UtcOffset.php b/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/lib/Property/VCard/DateAndOrTime.php b/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/lib/Property/VCard/TimeStamp.php b/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/lib/Recur/EventIterator.php b/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/lib/Recur/RDateIterator.php b/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/lib/Recur/RRuleIterator.php b/lib/Recur/RRuleIterator.php
@@ -37,6 +37,7 @@ public function __construct($rrule, DateTimeInterface $start)
 
     /* Implementation of the Iterator interface {{{ */
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         if (!$this->valid()) {
@@ -51,6 +52,7 @@ public function current()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->counter;
@@ -63,6 +65,7 @@ public function key()
      *
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         if (null === $this->currentDate) {
@@ -77,7 +80,10 @@ public function valid()
 
     /**
      * Resets the iterator.
+     *
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->currentDate = clone $this->startDate;
@@ -88,8 +94,10 @@ public function rewind()
      * Goes on to the next iteration.
      *
      * @param int $amount
+     * @return void
      */
-    public function next($amount = 1)
+    #[\ReturnTypeWillChange]
+    public function next(int $amount = 1)
     {
         // Otherwise, we find the next event in the normal RRULE
         // sequence.
@@ -640,6 +648,9 @@ protected function nextMonthly($amount = 1)
             // This goes to 0 because we need to start counting at the
             // 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
             $currentHourOfMonth = 0;
             $currentMinuteOfMonth = 0;
             $currentSecondOfMonth = 0;
@@ -650,6 +661,10 @@ protected function nextMonthly($amount = 1)
             if ($this->until && $this->currentDate->getTimestamp() >= $this->until->getTimestamp()) {
                 return;
             }
+            // 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 ....