Dolibarr / dolibarr

htdocs/includes/sabre/sabre/vobject/lib/ITip/Message.php

Indentation +105 added lines, -105 removed lines

@@ -16,121 +16,121 @@
  */
 class Message
 {
-    /**
-     * The object's UID.
-     *
-     * @var string
-     */
-    public $uid;
+	/**
+	 * The object's UID.
+	 *
+	 * @var string
+	 */
+	public $uid;
 
-    /**
-     * The component type, such as VEVENT.
-     *
-     * @var string
-     */
-    public $component;
+	/**
+	 * The component type, such as VEVENT.
+	 *
+	 * @var string
+	 */
+	public $component;
 
-    /**
-     * Contains the ITip method, which is something like REQUEST, REPLY or
-     * CANCEL.
-     *
-     * @var string
-     */
-    public $method;
+	/**
+	 * Contains the ITip method, which is something like REQUEST, REPLY or
+	 * CANCEL.
+	 *
+	 * @var string
+	 */
+	public $method;
 
-    /**
-     * The current sequence number for the event.
-     *
-     * @var int
-     */
-    public $sequence;
+	/**
+	 * The current sequence number for the event.
+	 *
+	 * @var int
+	 */
+	public $sequence;
 
-    /**
-     * The senders' email address.
-     *
-     * Note that this does not imply that this has to be used in a From: field
-     * if the message is sent by email. It may also be populated in Reply-To:
-     * or not at all.
-     *
-     * @var string
-     */
-    public $sender;
+	/**
+	 * The senders' email address.
+	 *
+	 * Note that this does not imply that this has to be used in a From: field
+	 * if the message is sent by email. It may also be populated in Reply-To:
+	 * or not at all.
+	 *
+	 * @var string
+	 */
+	public $sender;
 
-    /**
-     * The name of the sender. This is often populated from a CN parameter from
-     * either the ORGANIZER or ATTENDEE, depending on the message.
-     *
-     * @var string|null
-     */
-    public $senderName;
+	/**
+	 * The name of the sender. This is often populated from a CN parameter from
+	 * either the ORGANIZER or ATTENDEE, depending on the message.
+	 *
+	 * @var string|null
+	 */
+	public $senderName;
 
-    /**
-     * The recipient's email address.
-     *
-     * @var string
-     */
-    public $recipient;
+	/**
+	 * The recipient's email address.
+	 *
+	 * @var string
+	 */
+	public $recipient;
 
-    /**
-     * The name of the recipient. This is usually populated with the CN
-     * parameter from the ATTENDEE or ORGANIZER property, if it's available.
-     *
-     * @var string|null
-     */
-    public $recipientName;
+	/**
+	 * The name of the recipient. This is usually populated with the CN
+	 * parameter from the ATTENDEE or ORGANIZER property, if it's available.
+	 *
+	 * @var string|null
+	 */
+	public $recipientName;
 
-    /**
-     * After the message has been delivered, this should contain a string such
-     * as : 1.1;Sent or 1.2;Delivered.
-     *
-     * In case of a failure, this will hold the error status code.
-     *
-     * See:
-     * http://tools.ietf.org/html/rfc6638#section-7.3
-     *
-     * @var string
-     */
-    public $scheduleStatus;
+	/**
+	 * After the message has been delivered, this should contain a string such
+	 * as : 1.1;Sent or 1.2;Delivered.
+	 *
+	 * In case of a failure, this will hold the error status code.
+	 *
+	 * See:
+	 * http://tools.ietf.org/html/rfc6638#section-7.3
+	 *
+	 * @var string
+	 */
+	public $scheduleStatus;
 
-    /**
-     * The iCalendar / iTip body.
-     *
-     * @var \Sabre\VObject\Component\VCalendar
-     */
-    public $message;
+	/**
+	 * The iCalendar / iTip body.
+	 *
+	 * @var \Sabre\VObject\Component\VCalendar
+	 */
+	public $message;
 
-    /**
-     * This will be set to true, if the iTip broker considers the change
-     * 'significant'.
-     *
-     * In practice, this means that we'll only mark it true, if for instance
-     * DTSTART changed. This allows systems to only send iTip messages when
-     * significant changes happened. This is especially useful for iMip, as
-     * normally a ton of messages may be generated for normal calendar use.
-     *
-     * To see the list of properties that are considered 'significant', check
-     * out Sabre\VObject\ITip\Broker::$significantChangeProperties.
-     *
-     * @var bool
-     */
-    public $significantChange = true;
+	/**
+	 * This will be set to true, if the iTip broker considers the change
+	 * 'significant'.
+	 *
+	 * In practice, this means that we'll only mark it true, if for instance
+	 * DTSTART changed. This allows systems to only send iTip messages when
+	 * significant changes happened. This is especially useful for iMip, as
+	 * normally a ton of messages may be generated for normal calendar use.
+	 *
+	 * To see the list of properties that are considered 'significant', check
+	 * out Sabre\VObject\ITip\Broker::$significantChangeProperties.
+	 *
+	 * @var bool
+	 */
+	public $significantChange = true;
 
-    /**
-     * Returns the schedule status as a string.
-     *
-     * For example:
-     * 1.2
-     *
-     * @return mixed bool|string
-     */
-    public function getScheduleStatus()
-    {
-        if (!$this->scheduleStatus) {
-            return false;
-        } else {
-            list($scheduleStatus) = explode(';', $this->scheduleStatus);
+	/**
+	 * Returns the schedule status as a string.
+	 *
+	 * For example:
+	 * 1.2
+	 *
+	 * @return mixed bool|string
+	 */
+	public function getScheduleStatus()
+	{
+		if (!$this->scheduleStatus) {
+			return false;
+		} else {
+			list($scheduleStatus) = explode(';', $this->scheduleStatus);
 
-            return $scheduleStatus;
-        }
-    }
+			return $scheduleStatus;
+		}
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Writer.php

Indentation +42 added lines, -42 removed lines

@@ -16,53 +16,53 @@
  */
 class Writer
 {
-    /**
-     * Serializes a vCard or iCalendar object.
-     *
-     * @return string
-     */
-    public static function write(Component $component)
-    {
-        return $component->serialize();
-    }
+	/**
+	 * Serializes a vCard or iCalendar object.
+	 *
+	 * @return string
+	 */
+	public static function write(Component $component)
+	{
+		return $component->serialize();
+	}
 
-    /**
-     * Serializes a jCal or jCard object.
-     *
-     * @param int $options
-     *
-     * @return string
-     */
-    public static function writeJson(Component $component, $options = 0)
-    {
-        return json_encode($component, $options);
-    }
+	/**
+	 * Serializes a jCal or jCard object.
+	 *
+	 * @param int $options
+	 *
+	 * @return string
+	 */
+	public static function writeJson(Component $component, $options = 0)
+	{
+		return json_encode($component, $options);
+	}
 
-    /**
-     * Serializes a xCal or xCard object.
-     *
-     * @return string
-     */
-    public static function writeXml(Component $component)
-    {
-        $writer = new Xml\Writer();
-        $writer->openMemory();
-        $writer->setIndent(true);
+	/**
+	 * Serializes a xCal or xCard object.
+	 *
+	 * @return string
+	 */
+	public static function writeXml(Component $component)
+	{
+		$writer = new Xml\Writer();
+		$writer->openMemory();
+		$writer->setIndent(true);
 
-        $writer->startDocument('1.0', 'utf-8');
+		$writer->startDocument('1.0', 'utf-8');
 
-        if ($component instanceof Component\VCalendar) {
-            $writer->startElement('icalendar');
-            $writer->writeAttribute('xmlns', Parser\XML::XCAL_NAMESPACE);
-        } else {
-            $writer->startElement('vcards');
-            $writer->writeAttribute('xmlns', Parser\XML::XCARD_NAMESPACE);
-        }
+		if ($component instanceof Component\VCalendar) {
+			$writer->startElement('icalendar');
+			$writer->writeAttribute('xmlns', Parser\XML::XCAL_NAMESPACE);
+		} else {
+			$writer->startElement('vcards');
+			$writer->writeAttribute('xmlns', Parser\XML::XCARD_NAMESPACE);
+		}
 
-        $component->xmlSerialize($writer);
+		$component->xmlSerialize($writer);
 
-        $writer->endElement();
+		$writer->endElement();
 
-        return $writer->outputMemory();
-    }
+		return $writer->outputMemory();
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/ElementList.php

Indentation +25 added lines, -25 removed lines

@@ -17,32 +17,32 @@
  */
 class ElementList extends ArrayIterator
 {
-    /* {{{ ArrayAccess Interface */
+	/* {{{ ArrayAccess Interface */
 
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * @param int   $offset
-     * @param mixed $value
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
-    {
-        throw new LogicException('You can not add new objects to an ElementList');
-    }
+	/**
+	 * Sets an item through ArrayAccess.
+	 *
+	 * @param int   $offset
+	 * @param mixed $value
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetSet($offset, $value)
+	{
+		throw new LogicException('You can not add new objects to an ElementList');
+	}
 
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
-    {
-        throw new LogicException('You can not remove objects from an ElementList');
-    }
+	/**
+	 * Sets an item through ArrayAccess.
+	 *
+	 * This method just forwards the request to the inner iterator
+	 *
+	 * @param int $offset
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetUnset($offset)
+	{
+		throw new LogicException('You can not remove objects from an ElementList');
+	}
 
-    /* }}} */
+	/* }}} */
 }

htdocs/includes/sabre/sabre/vobject/lib/Settings.php

Indentation +33 added lines, -33 removed lines

@@ -17,39 +17,39 @@
  */
 class Settings
 {
-    /**
-     * The minimum date we accept for various calculations with dates, such as
-     * recurrences.
-     *
-     * The choice of 1900 is pretty arbitrary, but it covers most common
-     * use-cases. In particular, it covers birthdates for virtually everyone
-     * alive on earth, which is less than 5 people at the time of writing.
-     */
-    public static $minDate = '1900-01-01';
+	/**
+	 * The minimum date we accept for various calculations with dates, such as
+	 * recurrences.
+	 *
+	 * The choice of 1900 is pretty arbitrary, but it covers most common
+	 * use-cases. In particular, it covers birthdates for virtually everyone
+	 * alive on earth, which is less than 5 people at the time of writing.
+	 */
+	public static $minDate = '1900-01-01';
 
-    /**
-     * The maximum date we accept for various calculations with dates, such as
-     * recurrences.
-     *
-     * The choice of 2100 is pretty arbitrary, but should cover most
-     * appointments made for many years to come.
-     */
-    public static $maxDate = '2100-01-01';
+	/**
+	 * The maximum date we accept for various calculations with dates, such as
+	 * recurrences.
+	 *
+	 * The choice of 2100 is pretty arbitrary, but should cover most
+	 * appointments made for many years to come.
+	 */
+	public static $maxDate = '2100-01-01';
 
-    /**
-     * The maximum number of recurrences that will be generated.
-     *
-     * This setting limits the maximum of recurring events that this library
-     * generates in its recurrence iterators.
-     *
-     * This is a security measure. Without this, it would be possible to craft
-     * specific events that recur many, many times, potentially DDOSing the
-     * server.
-     *
-     * The default (3500) allows creation of a daily event that goes on for 10
-     * years, which is hopefully long enough for most.
-     *
-     * Set this value to -1 to disable this control altogether.
-     */
-    public static $maxRecurrences = 3500;
+	/**
+	 * The maximum number of recurrences that will be generated.
+	 *
+	 * This setting limits the maximum of recurring events that this library
+	 * generates in its recurrence iterators.
+	 *
+	 * This is a security measure. Without this, it would be possible to craft
+	 * specific events that recur many, many times, potentially DDOSing the
+	 * server.
+	 *
+	 * The default (3500) allows creation of a daily event that goes on for 10
+	 * years, which is hopefully long enough for most.
+	 *
+	 * Set this value to -1 to disable this control altogether.
+	 */
+	public static $maxRecurrences = 3500;
 }

htdocs/includes/sabre/sabre/vobject/lib/Reader.php

Indentation +71 added lines, -71 removed lines

@@ -14,82 +14,82 @@
  */
 class Reader
 {
-    /**
-     * If this option is passed to the reader, it will be less strict about the
-     * validity of the lines.
-     */
-    const OPTION_FORGIVING = 1;
+	/**
+	 * If this option is passed to the reader, it will be less strict about the
+	 * validity of the lines.
+	 */
+	const OPTION_FORGIVING = 1;
 
-    /**
-     * If this option is turned on, any lines we cannot parse will be ignored
-     * by the reader.
-     */
-    const OPTION_IGNORE_INVALID_LINES = 2;
+	/**
+	 * If this option is turned on, any lines we cannot parse will be ignored
+	 * by the reader.
+	 */
+	const OPTION_IGNORE_INVALID_LINES = 2;
 
-    /**
-     * Parses a vCard or iCalendar object, and returns the top component.
-     *
-     * The options argument is a bitfield. Pass any of the OPTIONS constant to
-     * alter the parsers' behaviour.
-     *
-     * You can either supply a string, or a readable stream for input.
-     *
-     * @param string|resource $data
-     * @param int             $options
-     * @param string          $charset
-     *
-     * @return Document
-     */
-    public static function read($data, $options = 0, $charset = 'UTF-8')
-    {
-        $parser = new Parser\MimeDir();
-        $parser->setCharset($charset);
-        $result = $parser->parse($data, $options);
+	/**
+	 * Parses a vCard or iCalendar object, and returns the top component.
+	 *
+	 * The options argument is a bitfield. Pass any of the OPTIONS constant to
+	 * alter the parsers' behaviour.
+	 *
+	 * You can either supply a string, or a readable stream for input.
+	 *
+	 * @param string|resource $data
+	 * @param int             $options
+	 * @param string          $charset
+	 *
+	 * @return Document
+	 */
+	public static function read($data, $options = 0, $charset = 'UTF-8')
+	{
+		$parser = new Parser\MimeDir();
+		$parser->setCharset($charset);
+		$result = $parser->parse($data, $options);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Parses a jCard or jCal object, and returns the top component.
-     *
-     * The options argument is a bitfield. Pass any of the OPTIONS constant to
-     * alter the parsers' behaviour.
-     *
-     * You can either a string, a readable stream, or an array for its input.
-     * Specifying the array is useful if json_decode was already called on the
-     * input.
-     *
-     * @param string|resource|array $data
-     * @param int                   $options
-     *
-     * @return Document
-     */
-    public static function readJson($data, $options = 0)
-    {
-        $parser = new Parser\Json();
-        $result = $parser->parse($data, $options);
+	/**
+	 * Parses a jCard or jCal object, and returns the top component.
+	 *
+	 * The options argument is a bitfield. Pass any of the OPTIONS constant to
+	 * alter the parsers' behaviour.
+	 *
+	 * You can either a string, a readable stream, or an array for its input.
+	 * Specifying the array is useful if json_decode was already called on the
+	 * input.
+	 *
+	 * @param string|resource|array $data
+	 * @param int                   $options
+	 *
+	 * @return Document
+	 */
+	public static function readJson($data, $options = 0)
+	{
+		$parser = new Parser\Json();
+		$result = $parser->parse($data, $options);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Parses a xCard or xCal object, and returns the top component.
-     *
-     * The options argument is a bitfield. Pass any of the OPTIONS constant to
-     * alter the parsers' behaviour.
-     *
-     * You can either supply a string, or a readable stream for input.
-     *
-     * @param string|resource $data
-     * @param int             $options
-     *
-     * @return Document
-     */
-    public static function readXML($data, $options = 0)
-    {
-        $parser = new Parser\XML();
-        $result = $parser->parse($data, $options);
+	/**
+	 * Parses a xCard or xCal object, and returns the top component.
+	 *
+	 * The options argument is a bitfield. Pass any of the OPTIONS constant to
+	 * alter the parsers' behaviour.
+	 *
+	 * You can either supply a string, or a readable stream for input.
+	 *
+	 * @param string|resource $data
+	 * @param int             $options
+	 *
+	 * @return Document
+	 */
+	public static function readXML($data, $options = 0)
+	{
+		$parser = new Parser\XML();
+		$result = $parser->parse($data, $options);
 
-        return $result;
-    }
+		return $result;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/StringUtil.php

Indentation +33 added lines, -33 removed lines

@@ -11,40 +11,40 @@
  */
 class StringUtil
 {
-    /**
-     * Returns true or false depending on if a string is valid UTF-8.
-     *
-     * @param string $str
-     *
-     * @return bool
-     */
-    public static function isUTF8($str)
-    {
-        // Control characters
-        if (preg_match('%[\x00-\x08\x0B-\x0C\x0E\x0F]%', $str)) {
-            return false;
-        }
+	/**
+	 * Returns true or false depending on if a string is valid UTF-8.
+	 *
+	 * @param string $str
+	 *
+	 * @return bool
+	 */
+	public static function isUTF8($str)
+	{
+		// Control characters
+		if (preg_match('%[\x00-\x08\x0B-\x0C\x0E\x0F]%', $str)) {
+			return false;
+		}
 
-        return (bool) preg_match('%%u', $str);
-    }
+		return (bool) preg_match('%%u', $str);
+	}
 
-    /**
-     * This method tries its best to convert the input string to UTF-8.
-     *
-     * Currently only ISO-5991-1 input and UTF-8 input is supported, but this
-     * may be expanded upon if we receive other examples.
-     *
-     * @param string $str
-     *
-     * @return string
-     */
-    public static function convertToUTF8($str)
-    {
-        if (!mb_check_encoding($str, 'UTF-8') && mb_check_encoding($str, 'ISO-8859-1')) {
-            $str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
-        }
+	/**
+	 * This method tries its best to convert the input string to UTF-8.
+	 *
+	 * Currently only ISO-5991-1 input and UTF-8 input is supported, but this
+	 * may be expanded upon if we receive other examples.
+	 *
+	 * @param string $str
+	 *
+	 * @return string
+	 */
+	public static function convertToUTF8($str)
+	{
+		if (!mb_check_encoding($str, 'UTF-8') && mb_check_encoding($str, 'ISO-8859-1')) {
+			$str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
+		}
 
-        // Removing any control characters
-        return preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', '', $str);
-    }
+		// Removing any control characters
+		return preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', '', $str);
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/BirthdayCalendarGenerator.php

Indentation +156 added lines, -156 removed lines

@@ -13,160 +13,160 @@
  */
 class BirthdayCalendarGenerator
 {
-    /**
-     * Input objects.
-     *
-     * @var array
-     */
-    protected $objects = [];
-
-    /**
-     * Default year.
-     * Used for dates without a year.
-     */
-    const DEFAULT_YEAR = 2000;
-
-    /**
-     * Output format for the SUMMARY.
-     *
-     * @var string
-     */
-    protected $format = '%1$s\'s Birthday';
-
-    /**
-     * Creates the generator.
-     *
-     * Check the setTimeRange and setObjects methods for details about the
-     * arguments.
-     *
-     * @param mixed $objects
-     */
-    public function __construct($objects = null)
-    {
-        if ($objects) {
-            $this->setObjects($objects);
-        }
-    }
-
-    /**
-     * Sets the input objects.
-     *
-     * You must either supply a vCard as a string or as a Component/VCard object.
-     * It's also possible to supply an array of strings or objects.
-     *
-     * @param mixed $objects
-     */
-    public function setObjects($objects)
-    {
-        if (!is_array($objects)) {
-            $objects = [$objects];
-        }
-
-        $this->objects = [];
-        foreach ($objects as $object) {
-            if (is_string($object)) {
-                $vObj = Reader::read($object);
-                if (!$vObj instanceof Component\VCard) {
-                    throw new \InvalidArgumentException('String could not be parsed as \\Sabre\\VObject\\Component\\VCard by setObjects');
-                }
-
-                $this->objects[] = $vObj;
-            } elseif ($object instanceof Component\VCard) {
-                $this->objects[] = $object;
-            } else {
-                throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component\\VCard arguments to setObjects');
-            }
-        }
-    }
-
-    /**
-     * Sets the output format for the SUMMARY.
-     *
-     * @param string $format
-     */
-    public function setFormat($format)
-    {
-        $this->format = $format;
-    }
-
-    /**
-     * Parses the input data and returns a VCALENDAR.
-     *
-     * @return Component/VCalendar
-     */
-    public function getResult()
-    {
-        $calendar = new VCalendar();
-
-        foreach ($this->objects as $object) {
-            // Skip if there is no BDAY property.
-            if (!$object->select('BDAY')) {
-                continue;
-            }
-
-            // We've seen clients (ez-vcard) putting "BDAY:" properties
-            // without a value into vCards. If we come across those, we'll
-            // skip them.
-            if (empty($object->BDAY->getValue())) {
-                continue;
-            }
-
-            // We're always converting to vCard 4.0 so we can rely on the
-            // VCardConverter handling the X-APPLE-OMIT-YEAR property for us.
-            $object = $object->convert(Document::VCARD40);
-
-            // Skip if the card has no FN property.
-            if (!isset($object->FN)) {
-                continue;
-            }
-
-            // Skip if the BDAY property is not of the right type.
-            if (!$object->BDAY instanceof Property\VCard\DateAndOrTime) {
-                continue;
-            }
-
-            // Skip if we can't parse the BDAY value.
-            try {
-                $dateParts = DateTimeParser::parseVCardDateTime($object->BDAY->getValue());
-            } catch (InvalidDataException $e) {
-                continue;
-            }
-
-            // Set a year if it's not set.
-            $unknownYear = false;
-
-            if (!$dateParts['year']) {
-                $object->BDAY = self::DEFAULT_YEAR.'-'.$dateParts['month'].'-'.$dateParts['date'];
-
-                $unknownYear = true;
-            }
-
-            // Create event.
-            $event = $calendar->add('VEVENT', [
-                'SUMMARY' => sprintf($this->format, $object->FN->getValue()),
-                'DTSTART' => new \DateTime($object->BDAY->getValue()),
-                'RRULE' => 'FREQ=YEARLY',
-                'TRANSP' => 'TRANSPARENT',
-            ]);
-
-            // add VALUE=date
-            $event->DTSTART['VALUE'] = 'DATE';
-
-            // Add X-SABRE-BDAY property.
-            if ($unknownYear) {
-                $event->add('X-SABRE-BDAY', 'BDAY', [
-                    'X-SABRE-VCARD-UID' => $object->UID->getValue(),
-                    'X-SABRE-VCARD-FN' => $object->FN->getValue(),
-                    'X-SABRE-OMIT-YEAR' => self::DEFAULT_YEAR,
-                ]);
-            } else {
-                $event->add('X-SABRE-BDAY', 'BDAY', [
-                    'X-SABRE-VCARD-UID' => $object->UID->getValue(),
-                    'X-SABRE-VCARD-FN' => $object->FN->getValue(),
-                ]);
-            }
-        }
-
-        return $calendar;
-    }
+	/**
+	 * Input objects.
+	 *
+	 * @var array
+	 */
+	protected $objects = [];
+
+	/**
+	 * Default year.
+	 * Used for dates without a year.
+	 */
+	const DEFAULT_YEAR = 2000;
+
+	/**
+	 * Output format for the SUMMARY.
+	 *
+	 * @var string
+	 */
+	protected $format = '%1$s\'s Birthday';
+
+	/**
+	 * Creates the generator.
+	 *
+	 * Check the setTimeRange and setObjects methods for details about the
+	 * arguments.
+	 *
+	 * @param mixed $objects
+	 */
+	public function __construct($objects = null)
+	{
+		if ($objects) {
+			$this->setObjects($objects);
+		}
+	}
+
+	/**
+	 * Sets the input objects.
+	 *
+	 * You must either supply a vCard as a string or as a Component/VCard object.
+	 * It's also possible to supply an array of strings or objects.
+	 *
+	 * @param mixed $objects
+	 */
+	public function setObjects($objects)
+	{
+		if (!is_array($objects)) {
+			$objects = [$objects];
+		}
+
+		$this->objects = [];
+		foreach ($objects as $object) {
+			if (is_string($object)) {
+				$vObj = Reader::read($object);
+				if (!$vObj instanceof Component\VCard) {
+					throw new \InvalidArgumentException('String could not be parsed as \\Sabre\\VObject\\Component\\VCard by setObjects');
+				}
+
+				$this->objects[] = $vObj;
+			} elseif ($object instanceof Component\VCard) {
+				$this->objects[] = $object;
+			} else {
+				throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component\\VCard arguments to setObjects');
+			}
+		}
+	}
+
+	/**
+	 * Sets the output format for the SUMMARY.
+	 *
+	 * @param string $format
+	 */
+	public function setFormat($format)
+	{
+		$this->format = $format;
+	}
+
+	/**
+	 * Parses the input data and returns a VCALENDAR.
+	 *
+	 * @return Component/VCalendar
+	 */
+	public function getResult()
+	{
+		$calendar = new VCalendar();
+
+		foreach ($this->objects as $object) {
+			// Skip if there is no BDAY property.
+			if (!$object->select('BDAY')) {
+				continue;
+			}
+
+			// We've seen clients (ez-vcard) putting "BDAY:" properties
+			// without a value into vCards. If we come across those, we'll
+			// skip them.
+			if (empty($object->BDAY->getValue())) {
+				continue;
+			}
+
+			// We're always converting to vCard 4.0 so we can rely on the
+			// VCardConverter handling the X-APPLE-OMIT-YEAR property for us.
+			$object = $object->convert(Document::VCARD40);
+
+			// Skip if the card has no FN property.
+			if (!isset($object->FN)) {
+				continue;
+			}
+
+			// Skip if the BDAY property is not of the right type.
+			if (!$object->BDAY instanceof Property\VCard\DateAndOrTime) {
+				continue;
+			}
+
+			// Skip if we can't parse the BDAY value.
+			try {
+				$dateParts = DateTimeParser::parseVCardDateTime($object->BDAY->getValue());
+			} catch (InvalidDataException $e) {
+				continue;
+			}
+
+			// Set a year if it's not set.
+			$unknownYear = false;
+
+			if (!$dateParts['year']) {
+				$object->BDAY = self::DEFAULT_YEAR.'-'.$dateParts['month'].'-'.$dateParts['date'];
+
+				$unknownYear = true;
+			}
+
+			// Create event.
+			$event = $calendar->add('VEVENT', [
+				'SUMMARY' => sprintf($this->format, $object->FN->getValue()),
+				'DTSTART' => new \DateTime($object->BDAY->getValue()),
+				'RRULE' => 'FREQ=YEARLY',
+				'TRANSP' => 'TRANSPARENT',
+			]);
+
+			// add VALUE=date
+			$event->DTSTART['VALUE'] = 'DATE';
+
+			// Add X-SABRE-BDAY property.
+			if ($unknownYear) {
+				$event->add('X-SABRE-BDAY', 'BDAY', [
+					'X-SABRE-VCARD-UID' => $object->UID->getValue(),
+					'X-SABRE-VCARD-FN' => $object->FN->getValue(),
+					'X-SABRE-OMIT-YEAR' => self::DEFAULT_YEAR,
+				]);
+			} else {
+				$event->add('X-SABRE-BDAY', 'BDAY', [
+					'X-SABRE-VCARD-UID' => $object->UID->getValue(),
+					'X-SABRE-VCARD-FN' => $object->FN->getValue(),
+				]);
+			}
+		}
+
+		return $calendar;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Recur/EventIterator.php

Indentation +434 added lines, -434 removed lines

@@ -60,438 +60,438 @@
  */
 class EventIterator implements \Iterator
 {
-    /**
-     * Reference timeZone for floating dates and times.
-     *
-     * @var DateTimeZone
-     */
-    protected $timeZone;
-
-    /**
-     * True if we're iterating an all-day event.
-     *
-     * @var bool
-     */
-    protected $allDay = false;
-
-    /**
-     * Creates the iterator.
-     *
-     * There's three ways to set up the iterator.
-     *
-     * 1. You can pass a VCALENDAR component and a UID.
-     * 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 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.
-     *
-     * @param Component|array $input
-     * @param string|null     $uid
-     * @param DateTimeZone    $timeZone reference timezone for floating dates and
-     *                                  times
-     */
-    public function __construct($input, $uid = null, DateTimeZone $timeZone = null)
-    {
-        if (is_null($timeZone)) {
-            $timeZone = new DateTimeZone('UTC');
-        }
-        $this->timeZone = $timeZone;
-
-        if (is_array($input)) {
-            $events = $input;
-        } elseif ($input instanceof VEvent) {
-            // Single instance mode.
-            $events = [$input];
-        } else {
-            // Calendar + UID mode.
-            $uid = (string) $uid;
-            if (!$uid) {
-                throw new InvalidArgumentException('The UID argument is required when a VCALENDAR is passed to this constructor');
-            }
-            if (!isset($input->VEVENT)) {
-                throw new InvalidArgumentException('No events found in this calendar');
-            }
-            $events = $input->getByUID($uid);
-        }
-
-        foreach ($events as $vevent) {
-            if (!isset($vevent->{'RECURRENCE-ID'})) {
-                $this->masterEvent = $vevent;
-            } else {
-                $this->exceptions[
-                    $vevent->{'RECURRENCE-ID'}->getDateTime($this->timeZone)->getTimeStamp()
-                ] = true;
-                $this->overriddenEvents[] = $vevent;
-            }
-        }
-
-        if (!$this->masterEvent) {
-            // No base event was found. CalDAV does allow cases where only
-            // overridden instances are stored.
-            //
-            // In this particular case, we're just going to grab the first
-            // event and use that instead. This may not always give the
-            // desired result.
-            if (!count($this->overriddenEvents)) {
-                throw new InvalidArgumentException('This VCALENDAR did not have an event with UID: '.$uid);
-            }
-            $this->masterEvent = array_shift($this->overriddenEvents);
-        }
-
-        $this->startDate = $this->masterEvent->DTSTART->getDateTime($this->timeZone);
-        $this->allDay = !$this->masterEvent->DTSTART->hasTime();
-
-        if (isset($this->masterEvent->EXDATE)) {
-            foreach ($this->masterEvent->EXDATE as $exDate) {
-                foreach ($exDate->getDateTimes($this->timeZone) as $dt) {
-                    $this->exceptions[$dt->getTimeStamp()] = true;
-                }
-            }
-        }
-
-        if (isset($this->masterEvent->DTEND)) {
-            $this->eventDuration =
-                $this->masterEvent->DTEND->getDateTime($this->timeZone)->getTimeStamp() -
-                $this->startDate->getTimeStamp();
-        } elseif (isset($this->masterEvent->DURATION)) {
-            $duration = $this->masterEvent->DURATION->getDateInterval();
-            $end = clone $this->startDate;
-            $end = $end->add($duration);
-            $this->eventDuration = $end->getTimeStamp() - $this->startDate->getTimeStamp();
-        } elseif ($this->allDay) {
-            $this->eventDuration = 3600 * 24;
-        } else {
-            $this->eventDuration = 0;
-        }
-
-        if (isset($this->masterEvent->RDATE)) {
-            $this->recurIterator = new RDateIterator(
-                $this->masterEvent->RDATE->getParts(),
-                $this->startDate
-            );
-        } elseif (isset($this->masterEvent->RRULE)) {
-            $this->recurIterator = new RRuleIterator(
-                $this->masterEvent->RRULE->getParts(),
-                $this->startDate
-            );
-        } else {
-            $this->recurIterator = new RRuleIterator(
-                [
-                    'FREQ' => 'DAILY',
-                    'COUNT' => 1,
-                ],
-                $this->startDate
-            );
-        }
-
-        $this->rewind();
-        if (!$this->valid()) {
-            throw new NoInstancesException('This recurrence rule does not generate any valid instances');
-        }
-    }
-
-    /**
-     * Returns the date for the current position of the iterator.
-     *
-     * @return DateTimeImmutable
-     */
-    #[\ReturnTypeWillChange]
-    public function current()
-    {
-        if ($this->currentDate) {
-            return clone $this->currentDate;
-        }
-    }
-
-    /**
-     * This method returns the start date for the current iteration of the
-     * event.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDtStart()
-    {
-        if ($this->currentDate) {
-            return clone $this->currentDate;
-        }
-    }
-
-    /**
-     * This method returns the end date for the current iteration of the
-     * event.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDtEnd()
-    {
-        if (!$this->valid()) {
-            return;
-        }
-        if ($this->currentOverriddenEvent && $this->currentOverriddenEvent->DTEND) {
-            return $this->currentOverriddenEvent->DTEND->getDateTime($this->timeZone);
-        } else {
-            $end = clone $this->currentDate;
-
-            return $end->modify('+'.$this->eventDuration.' seconds');
-        }
-    }
-
-    /**
-     * Returns a VEVENT for the current iterations of the event.
-     *
-     * This VEVENT will have a recurrence id, and its DTSTART and DTEND
-     * altered.
-     *
-     * @return VEvent
-     */
-    public function getEventObject()
-    {
-        if ($this->currentOverriddenEvent) {
-            return $this->currentOverriddenEvent;
-        }
-
-        $event = clone $this->masterEvent;
-
-        // Ignoring the following block, because PHPUnit's code coverage
-        // ignores most of these lines, and this messes with our stats.
-        //
-        // @codeCoverageIgnoreStart
-        unset(
-            $event->RRULE,
-            $event->EXDATE,
-            $event->RDATE,
-            $event->EXRULE,
-            $event->{'RECURRENCE-ID'}
-        );
-        // @codeCoverageIgnoreEnd
-
-        $event->DTSTART->setDateTime($this->getDtStart(), $event->DTSTART->isFloating());
-        if (isset($event->DTEND)) {
-            $event->DTEND->setDateTime($this->getDtEnd(), $event->DTEND->isFloating());
-        }
-        $recurid = clone $event->DTSTART;
-        $recurid->name = 'RECURRENCE-ID';
-        $event->add($recurid);
-
-        return $event;
-    }
-
-    /**
-     * Returns the current position of the iterator.
-     *
-     * This is for us simply a 0-based index.
-     *
-     * @return int
-     */
-    #[\ReturnTypeWillChange]
-    public function key()
-    {
-        // The counter is always 1 ahead.
-        return $this->counter - 1;
-    }
-
-    /**
-     * This is called after next, to see if the iterator is still at a valid
-     * position, or if it's at the end.
-     *
-     * @return bool
-     */
-    #[\ReturnTypeWillChange]
-    public function valid()
-    {
-        if ($this->counter > Settings::$maxRecurrences && -1 !== Settings::$maxRecurrences) {
-            throw new MaxInstancesExceededException('Recurring events are only allowed to generate '.Settings::$maxRecurrences);
-        }
-
-        return (bool) $this->currentDate;
-    }
-
-    /**
-     * Sets the iterator back to the starting point.
-     *
-     * @return void
-     */
-    #[\ReturnTypeWillChange]
-    public function rewind()
-    {
-        $this->recurIterator->rewind();
-        // re-creating overridden event index.
-        $index = [];
-        foreach ($this->overriddenEvents as $key => $event) {
-            $stamp = $event->DTSTART->getDateTime($this->timeZone)->getTimeStamp();
-            $index[$stamp][] = $key;
-        }
-        krsort($index);
-        $this->counter = 0;
-        $this->overriddenEventsIndex = $index;
-        $this->currentOverriddenEvent = null;
-
-        $this->nextDate = null;
-        $this->currentDate = clone $this->startDate;
-
-        $this->next();
-    }
-
-    /**
-     * Advances the iterator with one step.
-     *
-     * @return void
-     */
-    #[\ReturnTypeWillChange]
-    public function next()
-    {
-        $this->currentOverriddenEvent = null;
-        ++$this->counter;
-        if ($this->nextDate) {
-            // We had a stored value.
-            $nextDate = $this->nextDate;
-            $this->nextDate = null;
-        } else {
-            // We need to ask rruleparser for the next date.
-            // We need to do this until we find a date that's not in the
-            // exception list.
-            do {
-                if (!$this->recurIterator->valid()) {
-                    $nextDate = null;
-                    break;
-                }
-                $nextDate = $this->recurIterator->current();
-                $this->recurIterator->next();
-            } while (isset($this->exceptions[$nextDate->getTimeStamp()]));
-        }
-
-        // $nextDate now contains what rrule thinks is the next one, but an
-        // overridden event may cut ahead.
-        if ($this->overriddenEventsIndex) {
-            $offsets = end($this->overriddenEventsIndex);
-            $timestamp = key($this->overriddenEventsIndex);
-            $offset = end($offsets);
-            if (!$nextDate || $timestamp < $nextDate->getTimeStamp()) {
-                // Overridden event comes first.
-                $this->currentOverriddenEvent = $this->overriddenEvents[$offset];
-
-                // Putting the rrule next date aside.
-                $this->nextDate = $nextDate;
-                $this->currentDate = $this->currentOverriddenEvent->DTSTART->getDateTime($this->timeZone);
-
-                // Ensuring that this item will only be used once.
-                array_pop($this->overriddenEventsIndex[$timestamp]);
-                if (!$this->overriddenEventsIndex[$timestamp]) {
-                    array_pop($this->overriddenEventsIndex);
-                }
-
-                // Exit point!
-                return;
-            }
-        }
-
-        $this->currentDate = $nextDate;
-    }
-
-    /**
-     * Quickly jump to a date in the future.
-     */
-    public function fastForward(DateTimeInterface $dateTime)
-    {
-        while ($this->valid() && $this->getDtEnd() <= $dateTime) {
-            $this->next();
-        }
-    }
-
-    /**
-     * Returns true if this recurring event never ends.
-     *
-     * @return bool
-     */
-    public function isInfinite()
-    {
-        return $this->recurIterator->isInfinite();
-    }
-
-    /**
-     * RRULE parser.
-     *
-     * @var RRuleIterator
-     */
-    protected $recurIterator;
-
-    /**
-     * The duration, in seconds, of the master event.
-     *
-     * We use this to calculate the DTEND for subsequent events.
-     */
-    protected $eventDuration;
-
-    /**
-     * A reference to the main (master) event.
-     *
-     * @var VEVENT
-     */
-    protected $masterEvent;
-
-    /**
-     * List of overridden events.
-     *
-     * @var array
-     */
-    protected $overriddenEvents = [];
-
-    /**
-     * Overridden event index.
-     *
-     * Key is timestamp, value is the list of indexes of the item in the $overriddenEvent
-     * property.
-     *
-     * @var array
-     */
-    protected $overriddenEventsIndex;
-
-    /**
-     * A list of recurrence-id's that are either part of EXDATE, or are
-     * overridden.
-     *
-     * @var array
-     */
-    protected $exceptions = [];
-
-    /**
-     * Internal event counter.
-     *
-     * @var int
-     */
-    protected $counter;
-
-    /**
-     * The very start of the iteration process.
-     *
-     * @var DateTimeImmutable
-     */
-    protected $startDate;
-
-    /**
-     * Where we are currently in the iteration process.
-     *
-     * @var DateTimeImmutable
-     */
-    protected $currentDate;
-
-    /**
-     * The next date from the rrule parser.
-     *
-     * Sometimes we need to temporary store the next date, because an
-     * overridden event came before.
-     *
-     * @var DateTimeImmutable
-     */
-    protected $nextDate;
-
-    /**
-     * The event that overwrites the current iteration.
-     *
-     * @var VEVENT
-     */
-    protected $currentOverriddenEvent;
+	/**
+	 * Reference timeZone for floating dates and times.
+	 *
+	 * @var DateTimeZone
+	 */
+	protected $timeZone;
+
+	/**
+	 * True if we're iterating an all-day event.
+	 *
+	 * @var bool
+	 */
+	protected $allDay = false;
+
+	/**
+	 * Creates the iterator.
+	 *
+	 * There's three ways to set up the iterator.
+	 *
+	 * 1. You can pass a VCALENDAR component and a UID.
+	 * 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 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.
+	 *
+	 * @param Component|array $input
+	 * @param string|null     $uid
+	 * @param DateTimeZone    $timeZone reference timezone for floating dates and
+	 *                                  times
+	 */
+	public function __construct($input, $uid = null, DateTimeZone $timeZone = null)
+	{
+		if (is_null($timeZone)) {
+			$timeZone = new DateTimeZone('UTC');
+		}
+		$this->timeZone = $timeZone;
+
+		if (is_array($input)) {
+			$events = $input;
+		} elseif ($input instanceof VEvent) {
+			// Single instance mode.
+			$events = [$input];
+		} else {
+			// Calendar + UID mode.
+			$uid = (string) $uid;
+			if (!$uid) {
+				throw new InvalidArgumentException('The UID argument is required when a VCALENDAR is passed to this constructor');
+			}
+			if (!isset($input->VEVENT)) {
+				throw new InvalidArgumentException('No events found in this calendar');
+			}
+			$events = $input->getByUID($uid);
+		}
+
+		foreach ($events as $vevent) {
+			if (!isset($vevent->{'RECURRENCE-ID'})) {
+				$this->masterEvent = $vevent;
+			} else {
+				$this->exceptions[
+					$vevent->{'RECURRENCE-ID'}->getDateTime($this->timeZone)->getTimeStamp()
+				] = true;
+				$this->overriddenEvents[] = $vevent;
+			}
+		}
+
+		if (!$this->masterEvent) {
+			// No base event was found. CalDAV does allow cases where only
+			// overridden instances are stored.
+			//
+			// In this particular case, we're just going to grab the first
+			// event and use that instead. This may not always give the
+			// desired result.
+			if (!count($this->overriddenEvents)) {
+				throw new InvalidArgumentException('This VCALENDAR did not have an event with UID: '.$uid);
+			}
+			$this->masterEvent = array_shift($this->overriddenEvents);
+		}
+
+		$this->startDate = $this->masterEvent->DTSTART->getDateTime($this->timeZone);
+		$this->allDay = !$this->masterEvent->DTSTART->hasTime();
+
+		if (isset($this->masterEvent->EXDATE)) {
+			foreach ($this->masterEvent->EXDATE as $exDate) {
+				foreach ($exDate->getDateTimes($this->timeZone) as $dt) {
+					$this->exceptions[$dt->getTimeStamp()] = true;
+				}
+			}
+		}
+
+		if (isset($this->masterEvent->DTEND)) {
+			$this->eventDuration =
+				$this->masterEvent->DTEND->getDateTime($this->timeZone)->getTimeStamp() -
+				$this->startDate->getTimeStamp();
+		} elseif (isset($this->masterEvent->DURATION)) {
+			$duration = $this->masterEvent->DURATION->getDateInterval();
+			$end = clone $this->startDate;
+			$end = $end->add($duration);
+			$this->eventDuration = $end->getTimeStamp() - $this->startDate->getTimeStamp();
+		} elseif ($this->allDay) {
+			$this->eventDuration = 3600 * 24;
+		} else {
+			$this->eventDuration = 0;
+		}
+
+		if (isset($this->masterEvent->RDATE)) {
+			$this->recurIterator = new RDateIterator(
+				$this->masterEvent->RDATE->getParts(),
+				$this->startDate
+			);
+		} elseif (isset($this->masterEvent->RRULE)) {
+			$this->recurIterator = new RRuleIterator(
+				$this->masterEvent->RRULE->getParts(),
+				$this->startDate
+			);
+		} else {
+			$this->recurIterator = new RRuleIterator(
+				[
+					'FREQ' => 'DAILY',
+					'COUNT' => 1,
+				],
+				$this->startDate
+			);
+		}
+
+		$this->rewind();
+		if (!$this->valid()) {
+			throw new NoInstancesException('This recurrence rule does not generate any valid instances');
+		}
+	}
+
+	/**
+	 * Returns the date for the current position of the iterator.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	#[\ReturnTypeWillChange]
+	public function current()
+	{
+		if ($this->currentDate) {
+			return clone $this->currentDate;
+		}
+	}
+
+	/**
+	 * This method returns the start date for the current iteration of the
+	 * event.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDtStart()
+	{
+		if ($this->currentDate) {
+			return clone $this->currentDate;
+		}
+	}
+
+	/**
+	 * This method returns the end date for the current iteration of the
+	 * event.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDtEnd()
+	{
+		if (!$this->valid()) {
+			return;
+		}
+		if ($this->currentOverriddenEvent && $this->currentOverriddenEvent->DTEND) {
+			return $this->currentOverriddenEvent->DTEND->getDateTime($this->timeZone);
+		} else {
+			$end = clone $this->currentDate;
+
+			return $end->modify('+'.$this->eventDuration.' seconds');
+		}
+	}
+
+	/**
+	 * Returns a VEVENT for the current iterations of the event.
+	 *
+	 * This VEVENT will have a recurrence id, and its DTSTART and DTEND
+	 * altered.
+	 *
+	 * @return VEvent
+	 */
+	public function getEventObject()
+	{
+		if ($this->currentOverriddenEvent) {
+			return $this->currentOverriddenEvent;
+		}
+
+		$event = clone $this->masterEvent;
+
+		// Ignoring the following block, because PHPUnit's code coverage
+		// ignores most of these lines, and this messes with our stats.
+		//
+		// @codeCoverageIgnoreStart
+		unset(
+			$event->RRULE,
+			$event->EXDATE,
+			$event->RDATE,
+			$event->EXRULE,
+			$event->{'RECURRENCE-ID'}
+		);
+		// @codeCoverageIgnoreEnd
+
+		$event->DTSTART->setDateTime($this->getDtStart(), $event->DTSTART->isFloating());
+		if (isset($event->DTEND)) {
+			$event->DTEND->setDateTime($this->getDtEnd(), $event->DTEND->isFloating());
+		}
+		$recurid = clone $event->DTSTART;
+		$recurid->name = 'RECURRENCE-ID';
+		$event->add($recurid);
+
+		return $event;
+	}
+
+	/**
+	 * Returns the current position of the iterator.
+	 *
+	 * This is for us simply a 0-based index.
+	 *
+	 * @return int
+	 */
+	#[\ReturnTypeWillChange]
+	public function key()
+	{
+		// The counter is always 1 ahead.
+		return $this->counter - 1;
+	}
+
+	/**
+	 * This is called after next, to see if the iterator is still at a valid
+	 * position, or if it's at the end.
+	 *
+	 * @return bool
+	 */
+	#[\ReturnTypeWillChange]
+	public function valid()
+	{
+		if ($this->counter > Settings::$maxRecurrences && -1 !== Settings::$maxRecurrences) {
+			throw new MaxInstancesExceededException('Recurring events are only allowed to generate '.Settings::$maxRecurrences);
+		}
+
+		return (bool) $this->currentDate;
+	}
+
+	/**
+	 * Sets the iterator back to the starting point.
+	 *
+	 * @return void
+	 */
+	#[\ReturnTypeWillChange]
+	public function rewind()
+	{
+		$this->recurIterator->rewind();
+		// re-creating overridden event index.
+		$index = [];
+		foreach ($this->overriddenEvents as $key => $event) {
+			$stamp = $event->DTSTART->getDateTime($this->timeZone)->getTimeStamp();
+			$index[$stamp][] = $key;
+		}
+		krsort($index);
+		$this->counter = 0;
+		$this->overriddenEventsIndex = $index;
+		$this->currentOverriddenEvent = null;
+
+		$this->nextDate = null;
+		$this->currentDate = clone $this->startDate;
+
+		$this->next();
+	}
+
+	/**
+	 * Advances the iterator with one step.
+	 *
+	 * @return void
+	 */
+	#[\ReturnTypeWillChange]
+	public function next()
+	{
+		$this->currentOverriddenEvent = null;
+		++$this->counter;
+		if ($this->nextDate) {
+			// We had a stored value.
+			$nextDate = $this->nextDate;
+			$this->nextDate = null;
+		} else {
+			// We need to ask rruleparser for the next date.
+			// We need to do this until we find a date that's not in the
+			// exception list.
+			do {
+				if (!$this->recurIterator->valid()) {
+					$nextDate = null;
+					break;
+				}
+				$nextDate = $this->recurIterator->current();
+				$this->recurIterator->next();
+			} while (isset($this->exceptions[$nextDate->getTimeStamp()]));
+		}
+
+		// $nextDate now contains what rrule thinks is the next one, but an
+		// overridden event may cut ahead.
+		if ($this->overriddenEventsIndex) {
+			$offsets = end($this->overriddenEventsIndex);
+			$timestamp = key($this->overriddenEventsIndex);
+			$offset = end($offsets);
+			if (!$nextDate || $timestamp < $nextDate->getTimeStamp()) {
+				// Overridden event comes first.
+				$this->currentOverriddenEvent = $this->overriddenEvents[$offset];
+
+				// Putting the rrule next date aside.
+				$this->nextDate = $nextDate;
+				$this->currentDate = $this->currentOverriddenEvent->DTSTART->getDateTime($this->timeZone);
+
+				// Ensuring that this item will only be used once.
+				array_pop($this->overriddenEventsIndex[$timestamp]);
+				if (!$this->overriddenEventsIndex[$timestamp]) {
+					array_pop($this->overriddenEventsIndex);
+				}
+
+				// Exit point!
+				return;
+			}
+		}
+
+		$this->currentDate = $nextDate;
+	}
+
+	/**
+	 * Quickly jump to a date in the future.
+	 */
+	public function fastForward(DateTimeInterface $dateTime)
+	{
+		while ($this->valid() && $this->getDtEnd() <= $dateTime) {
+			$this->next();
+		}
+	}
+
+	/**
+	 * Returns true if this recurring event never ends.
+	 *
+	 * @return bool
+	 */
+	public function isInfinite()
+	{
+		return $this->recurIterator->isInfinite();
+	}
+
+	/**
+	 * RRULE parser.
+	 *
+	 * @var RRuleIterator
+	 */
+	protected $recurIterator;
+
+	/**
+	 * The duration, in seconds, of the master event.
+	 *
+	 * We use this to calculate the DTEND for subsequent events.
+	 */
+	protected $eventDuration;
+
+	/**
+	 * A reference to the main (master) event.
+	 *
+	 * @var VEVENT
+	 */
+	protected $masterEvent;
+
+	/**
+	 * List of overridden events.
+	 *
+	 * @var array
+	 */
+	protected $overriddenEvents = [];
+
+	/**
+	 * Overridden event index.
+	 *
+	 * Key is timestamp, value is the list of indexes of the item in the $overriddenEvent
+	 * property.
+	 *
+	 * @var array
+	 */
+	protected $overriddenEventsIndex;
+
+	/**
+	 * A list of recurrence-id's that are either part of EXDATE, or are
+	 * overridden.
+	 *
+	 * @var array
+	 */
+	protected $exceptions = [];
+
+	/**
+	 * Internal event counter.
+	 *
+	 * @var int
+	 */
+	protected $counter;
+
+	/**
+	 * The very start of the iteration process.
+	 *
+	 * @var DateTimeImmutable
+	 */
+	protected $startDate;
+
+	/**
+	 * Where we are currently in the iteration process.
+	 *
+	 * @var DateTimeImmutable
+	 */
+	protected $currentDate;
+
+	/**
+	 * The next date from the rrule parser.
+	 *
+	 * Sometimes we need to temporary store the next date, because an
+	 * overridden event came before.
+	 *
+	 * @var DateTimeImmutable
+	 */
+	protected $nextDate;
+
+	/**
+	 * The event that overwrites the current iteration.
+	 *
+	 * @var VEVENT
+	 */
+	protected $currentOverriddenEvent;
 }

htdocs/includes/sabre/sabre/vobject/lib/Recur/RRuleIterator.php

Indentation +983 added lines, -983 removed lines

@@ -24,987 +24,987 @@
  */
 class RRuleIterator implements Iterator
 {
-    /**
-     * Constant denoting the upper limit on how long into the future
-     * we want to iterate. The value is a unix timestamp and currently
-     * corresponds to the datetime 9999-12-31 11:59:59 UTC.
-     */
-    const dateUpperLimit = 253402300799;
-
-    /**
-     * Creates the Iterator.
-     *
-     * @param string|array $rrule
-     */
-    public function __construct($rrule, DateTimeInterface $start)
-    {
-        $this->startDate = $start;
-        $this->parseRRule($rrule);
-        $this->currentDate = clone $this->startDate;
-    }
-
-    /* Implementation of the Iterator interface {{{ */
-
-    #[\ReturnTypeWillChange]
-    public function current()
-    {
-        if (!$this->valid()) {
-            return;
-        }
-
-        return clone $this->currentDate;
-    }
-
-    /**
-     * Returns the current item number.
-     *
-     * @return int
-     */
-    #[\ReturnTypeWillChange]
-    public function key()
-    {
-        return $this->counter;
-    }
-
-    /**
-     * Returns whether the current item is a valid item for the recurrence
-     * iterator. This will return false if we've gone beyond the UNTIL or COUNT
-     * statements.
-     *
-     * @return bool
-     */
-    #[\ReturnTypeWillChange]
-    public function valid()
-    {
-        if (null === $this->currentDate) {
-            return false;
-        }
-        if (!is_null($this->count)) {
-            return $this->counter < $this->count;
-        }
-
-        return is_null($this->until) || $this->currentDate <= $this->until;
-    }
-
-    /**
-     * Resets the iterator.
-     *
-     * @return void
-     */
-    #[\ReturnTypeWillChange]
-    public function rewind()
-    {
-        $this->currentDate = clone $this->startDate;
-        $this->counter = 0;
-    }
-
-    /**
-     * Goes on to the next iteration.
-     *
-     * @return void
-     */
-    #[\ReturnTypeWillChange]
-    public function next()
-    {
-        // Otherwise, we find the next event in the normal RRULE
-        // sequence.
-        switch ($this->frequency) {
-            case 'hourly':
-                $this->nextHourly();
-                break;
-
-            case 'daily':
-                $this->nextDaily();
-                break;
-
-            case 'weekly':
-                $this->nextWeekly();
-                break;
-
-            case 'monthly':
-                $this->nextMonthly();
-                break;
-
-            case 'yearly':
-                $this->nextYearly();
-                break;
-        }
-        ++$this->counter;
-    }
-
-    /* End of Iterator implementation }}} */
-
-    /**
-     * Returns true if this recurring event never ends.
-     *
-     * @return bool
-     */
-    public function isInfinite()
-    {
-        return !$this->count && !$this->until;
-    }
-
-    /**
-     * This method allows you to quickly go to the next occurrence after the
-     * specified date.
-     */
-    public function fastForward(DateTimeInterface $dt)
-    {
-        while ($this->valid() && $this->currentDate < $dt) {
-            $this->next();
-        }
-    }
-
-    /**
-     * The reference start date/time for the rrule.
-     *
-     * All calculations are based on this initial date.
-     *
-     * @var DateTimeInterface
-     */
-    protected $startDate;
-
-    /**
-     * The date of the current iteration. You can get this by calling
-     * ->current().
-     *
-     * @var DateTimeInterface
-     */
-    protected $currentDate;
-
-    /**
-     * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
-     * yearly.
-     *
-     * @var string
-     */
-    protected $frequency;
-
-    /**
-     * The number of recurrences, or 'null' if infinitely recurring.
-     *
-     * @var int
-     */
-    protected $count;
-
-    /**
-     * The interval.
-     *
-     * If for example frequency is set to daily, interval = 2 would mean every
-     * 2 days.
-     *
-     * @var int
-     */
-    protected $interval = 1;
-
-    /**
-     * The last instance of this recurrence, inclusively.
-     *
-     * @var DateTimeInterface|null
-     */
-    protected $until;
-
-    /**
-     * Which seconds to recur.
-     *
-     * This is an array of integers (between 0 and 60)
-     *
-     * @var array
-     */
-    protected $bySecond;
-
-    /**
-     * Which minutes to recur.
-     *
-     * This is an array of integers (between 0 and 59)
-     *
-     * @var array
-     */
-    protected $byMinute;
-
-    /**
-     * Which hours to recur.
-     *
-     * This is an array of integers (between 0 and 23)
-     *
-     * @var array
-     */
-    protected $byHour;
-
-    /**
-     * The current item in the list.
-     *
-     * You can get this number with the key() method.
-     *
-     * @var int
-     */
-    protected $counter = 0;
-
-    /**
-     * Which weekdays to recur.
-     *
-     * This is an array of weekdays
-     *
-     * This may also be preceded 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.
-     *
-     * @var array
-     */
-    protected $byDay;
-
-    /**
-     * Which days of the month to recur.
-     *
-     * This is an array of days of the months (1-31). The value can also be
-     * negative. -5 for instance means the 5th last day of the month.
-     *
-     * @var array
-     */
-    protected $byMonthDay;
-
-    /**
-     * Which days of the year to recur.
-     *
-     * This is an array with days of the year (1 to 366). The values can also
-     * be negative. For instance, -1 will always represent the last day of the
-     * year. (December 31st).
-     *
-     * @var array
-     */
-    protected $byYearDay;
-
-    /**
-     * Which week numbers to recur.
-     *
-     * This is an array of integers from 1 to 53. The values can also be
-     * negative. -1 will always refer to the last week of the year.
-     *
-     * @var array
-     */
-    protected $byWeekNo;
-
-    /**
-     * Which months to recur.
-     *
-     * This is an array of integers from 1 to 12.
-     *
-     * @var array
-     */
-    protected $byMonth;
-
-    /**
-     * Which items in an existing st to recur.
-     *
-     * These numbers work together with an existing by* rule. It specifies
-     * exactly which items of the existing by-rule to filter.
-     *
-     * Valid values are 1 to 366 and -1 to -366. As an example, this can be
-     * used to recur the last workday of the month.
-     *
-     * This would be done by setting frequency to 'monthly', byDay to
-     * 'MO,TU,WE,TH,FR' and bySetPos to -1.
-     *
-     * @var array
-     */
-    protected $bySetPos;
-
-    /**
-     * When the week starts.
-     *
-     * @var string
-     */
-    protected $weekStart = 'MO';
-
-    /* Functions that advance the iterator {{{ */
-
-    /**
-     * Does the processing for advancing the iterator for hourly frequency.
-     */
-    protected function nextHourly()
-    {
-        $this->currentDate = $this->currentDate->modify('+'.$this->interval.' hours');
-    }
-
-    /**
-     * Does the processing for advancing the iterator for daily frequency.
-     */
-    protected function nextDaily()
-    {
-        if (!$this->byHour && !$this->byDay) {
-            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' days');
-
-            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();
-        }
-
-        do {
-            if ($this->byHour) {
-                if ('23' == $this->currentDate->format('G')) {
-                    // to obey the interval rule
-                    $this->currentDate = $this->currentDate->modify('+'.($this->interval - 1).' days');
-                }
-
-                $this->currentDate = $this->currentDate->modify('+1 hours');
-            } else {
-                $this->currentDate = $this->currentDate->modify('+'.$this->interval.' days');
-            }
-
-            // Current month of the year
-            $currentMonth = $this->currentDate->format('n');
-
-            // Current day of the week
-            $currentDay = $this->currentDate->format('w');
-
-            // Current hour of the day
-            $currentHour = $this->currentDate->format('G');
-
-            if ($this->currentDate->getTimestamp() > self::dateUpperLimit) {
-                $this->currentDate = null;
-
-                return;
-            }
-        } while (
-            ($this->byDay && !in_array($currentDay, $recurrenceDays)) ||
-            ($this->byHour && !in_array($currentHour, $recurrenceHours)) ||
-            ($this->byMonth && !in_array($currentMonth, $recurrenceMonths))
-        );
-    }
-
-    /**
-     * Does the processing for advancing the iterator for weekly frequency.
-     */
-    protected function nextWeekly()
-    {
-        if (!$this->byHour && !$this->byDay) {
-            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' weeks');
-
-            return;
-        }
-
-        $recurrenceHours = [];
-        if ($this->byHour) {
-            $recurrenceHours = $this->getHours();
-        }
-
-        $recurrenceDays = [];
-        if ($this->byDay) {
-            $recurrenceDays = $this->getDays();
-        }
-
-        // First day of the week:
-        $firstDay = $this->dayMap[$this->weekStart];
-
-        do {
-            if ($this->byHour) {
-                $this->currentDate = $this->currentDate->modify('+1 hours');
-            } else {
-                $this->currentDate = $this->currentDate->modify('+1 days');
-            }
-
-            // Current day of the week
-            $currentDay = (int) $this->currentDate->format('w');
-
-            // Current hour of the day
-            $currentHour = (int) $this->currentDate->format('G');
-
-            // We need to roll over to the next week
-            if ($currentDay === $firstDay && (!$this->byHour || '0' == $currentHour)) {
-                $this->currentDate = $this->currentDate->modify('+'.($this->interval - 1).' weeks');
-
-                // We need to go to the first day of this week, but only if we
-                // are not already on this first day of this week.
-                if ($this->currentDate->format('w') != $firstDay) {
-                    $this->currentDate = $this->currentDate->modify('last '.$this->dayNames[$this->dayMap[$this->weekStart]]);
-                }
-            }
-
-            // We have a match
-        } while (($this->byDay && !in_array($currentDay, $recurrenceDays)) || ($this->byHour && !in_array($currentHour, $recurrenceHours)));
-    }
-
-    /**
-     * Does the processing for advancing the iterator for monthly frequency.
-     */
-    protected function nextMonthly()
-    {
-        $currentDayOfMonth = $this->currentDate->format('j');
-        if (!$this->byMonthDay && !$this->byDay) {
-            // If the current day is higher than the 28th, rollover can
-            // occur to the next month. We Must skip these invalid
-            // entries.
-            if ($currentDayOfMonth < 29) {
-                $this->currentDate = $this->currentDate->modify('+'.$this->interval.' months');
-            } else {
-                $increase = 0;
-                do {
-                    ++$increase;
-                    $tempDate = clone $this->currentDate;
-                    $tempDate = $tempDate->modify('+ '.($this->interval * $increase).' months');
-                } while ($tempDate->format('j') != $currentDayOfMonth);
-                $this->currentDate = $tempDate;
-            }
-
-            return;
-        }
-
-        $occurrence = -1;
-        while (true) {
-            $occurrences = $this->getMonthlyOccurrences();
-
-            foreach ($occurrences as $occurrence) {
-                // The first occurrence thats higher than the current
-                // day of the month wins.
-                if ($occurrence > $currentDayOfMonth) {
-                    break 2;
-                }
-            }
-
-            // If we made it all the way here, it means there were no
-            // valid occurrences, and we need to advance to the next
-            // month.
-            //
-            // This line does not currently work in hhvm. Temporary workaround
-            // follows:
-            // $this->currentDate->modify('first day of this month');
-            $this->currentDate = new DateTimeImmutable($this->currentDate->format('Y-m-1 H:i:s'), $this->currentDate->getTimezone());
-            // end of workaround
-            $this->currentDate = $this->currentDate->modify('+ '.$this->interval.' months');
-
-            // 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
-            // 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() > self::dateUpperLimit) {
-                $this->currentDate = null;
-
-                return;
-            }
-        }
-
-        $this->currentDate = $this->currentDate->setDate(
-            (int) $this->currentDate->format('Y'),
-            (int) $this->currentDate->format('n'),
-            (int) $occurrence
-        );
-    }
-
-    /**
-     * Does the processing for advancing the iterator for yearly frequency.
-     */
-    protected function nextYearly()
-    {
-        $currentMonth = $this->currentDate->format('n');
-        $currentYear = $this->currentDate->format('Y');
-        $currentDayOfMonth = $this->currentDate->format('j');
-
-        // No sub-rules, so we just advance by year
-        if (empty($this->byMonth)) {
-            // Unless it was a leap day!
-            if (2 == $currentMonth && 29 == $currentDayOfMonth) {
-                $counter = 0;
-                do {
-                    ++$counter;
-                    // Here we increase the year count by the interval, until
-                    // we hit a date that's also in a leap year.
-                    //
-                    // We could just find the next interval that's dividable by
-                    // 4, but that would ignore the rule that there's no leap
-                    // year every year that's dividable by a 100, but not by
-                    // 400. (1800, 1900, 2100). So we just rely on the datetime
-                    // functions instead.
-                    $nextDate = clone $this->currentDate;
-                    $nextDate = $nextDate->modify('+ '.($this->interval * $counter).' years');
-                } while (2 != $nextDate->format('n'));
-
-                $this->currentDate = $nextDate;
-
-                return;
-            }
-
-            if (null !== $this->byWeekNo) { // byWeekNo is an array with values from -53 to -1, or 1 to 53
-                $dayOffsets = [];
-                if ($this->byDay) {
-                    foreach ($this->byDay as $byDay) {
-                        $dayOffsets[] = $this->dayMap[$byDay];
-                    }
-                } else {   // default is Monday
-                    $dayOffsets[] = 1;
-                }
-
-                $currentYear = $this->currentDate->format('Y');
-
-                while (true) {
-                    $checkDates = [];
-
-                    // loop through all WeekNo and Days to check all the combinations
-                    foreach ($this->byWeekNo as $byWeekNo) {
-                        foreach ($dayOffsets as $dayOffset) {
-                            $date = clone $this->currentDate;
-                            $date = $date->setISODate($currentYear, $byWeekNo, $dayOffset);
-
-                            if ($date > $this->currentDate) {
-                                $checkDates[] = $date;
-                            }
-                        }
-                    }
-
-                    if (count($checkDates) > 0) {
-                        $this->currentDate = min($checkDates);
-
-                        return;
-                    }
-
-                    // if there is no date found, check the next year
-                    $currentYear += $this->interval;
-                }
-            }
-
-            if (null !== $this->byYearDay) { // byYearDay is an array with values from -366 to -1, or 1 to 366
-                $dayOffsets = [];
-                if ($this->byDay) {
-                    foreach ($this->byDay as $byDay) {
-                        $dayOffsets[] = $this->dayMap[$byDay];
-                    }
-                } else {   // default is Monday-Sunday
-                    $dayOffsets = [1, 2, 3, 4, 5, 6, 7];
-                }
-
-                $currentYear = $this->currentDate->format('Y');
-
-                while (true) {
-                    $checkDates = [];
-
-                    // loop through all YearDay and Days to check all the combinations
-                    foreach ($this->byYearDay as $byYearDay) {
-                        $date = clone $this->currentDate;
-                        if ($byYearDay > 0) {
-                            $date = $date->setDate($currentYear, 1, 1);
-                            $date = $date->add(new \DateInterval('P'.($byYearDay - 1).'D'));
-                        } else {
-                            $date = $date->setDate($currentYear, 12, 31);
-                            $date = $date->sub(new \DateInterval('P'.abs($byYearDay + 1).'D'));
-                        }
-
-                        if ($date > $this->currentDate && in_array($date->format('N'), $dayOffsets)) {
-                            $checkDates[] = $date;
-                        }
-                    }
-
-                    if (count($checkDates) > 0) {
-                        $this->currentDate = min($checkDates);
-
-                        return;
-                    }
-
-                    // if there is no date found, check the next year
-                    $currentYear += $this->interval;
-                }
-            }
-
-            // The easiest form
-            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' years');
-
-            return;
-        }
-
-        $currentMonth = $this->currentDate->format('n');
-        $currentYear = $this->currentDate->format('Y');
-        $currentDayOfMonth = $this->currentDate->format('j');
-
-        $advancedToNewMonth = false;
-
-        // 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();
-
-                foreach ($occurrences as $occurrence) {
-                    // The first occurrence that's higher than the current
-                    // day of the month wins.
-                    // If we advanced to the next month or year, the first
-                    // occurrence is always correct.
-                    if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
-                        break 2;
-                    }
-                }
-
-                // If we made it here, it means we need to advance to
-                // the next month or year.
-                $currentDayOfMonth = 1;
-                $advancedToNewMonth = true;
-                do {
-                    ++$currentMonth;
-                    if ($currentMonth > 12) {
-                        $currentYear += $this->interval;
-                        $currentMonth = 1;
-                    }
-                } while (!in_array($currentMonth, $this->byMonth));
-
-                $this->currentDate = $this->currentDate->setDate(
-                    (int) $currentYear,
-                    (int) $currentMonth,
-                    (int) $currentDayOfMonth
-                );
-
-                // 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() > self::dateUpperLimit) {
-                    $this->currentDate = null;
-
-                    return;
-                }
-            }
-
-            // If we made it here, it means we got a valid occurrence
-            $this->currentDate = $this->currentDate->setDate(
-                (int) $currentYear,
-                (int) $currentMonth,
-                (int) $occurrence
-            );
-
-            return;
-        } else {
-            // These are the 'byMonth' rules, if there are no byDay or
-            // byMonthDay sub-rules.
-            do {
-                ++$currentMonth;
-                if ($currentMonth > 12) {
-                    $currentYear += $this->interval;
-                    $currentMonth = 1;
-                }
-            } while (!in_array($currentMonth, $this->byMonth));
-            $this->currentDate = $this->currentDate->setDate(
-                (int) $currentYear,
-                (int) $currentMonth,
-                (int) $currentDayOfMonth
-            );
-
-            return;
-        }
-    }
-
-    /* }}} */
-
-    /**
-     * This method receives a string from an RRULE property, and populates this
-     * class with all the values.
-     *
-     * @param string|array $rrule
-     */
-    protected function parseRRule($rrule)
-    {
-        if (is_string($rrule)) {
-            $rrule = Property\ICalendar\Recur::stringToArray($rrule);
-        }
-
-        foreach ($rrule as $key => $value) {
-            $key = strtoupper($key);
-            switch ($key) {
-                case 'FREQ':
-                    $value = strtolower($value);
-                    if (!in_array(
-                        $value,
-                        ['secondly', 'minutely', 'hourly', 'daily', 'weekly', 'monthly', 'yearly']
-                    )) {
-                        throw new InvalidDataException('Unknown value for FREQ='.strtoupper($value));
-                    }
-                    $this->frequency = $value;
-                    break;
-
-                case 'UNTIL':
-                    $this->until = DateTimeParser::parse($value, $this->startDate->getTimezone());
-
-                    // In some cases events are generated with an UNTIL=
-                    // parameter before the actual start of the event.
-                    //
-                    // Not sure why this is happening. We assume that the
-                    // intention was that the event only recurs once.
-                    //
-                    // So we are modifying the parameter so our code doesn't
-                    // break.
-                    if ($this->until < $this->startDate) {
-                        $this->until = $this->startDate;
-                    }
-                    break;
-
-                case 'INTERVAL':
-                case 'COUNT':
-                    $val = (int) $value;
-                    if ($val < 1) {
-                        throw new InvalidDataException(strtoupper($key).' in RRULE must be a positive integer!');
-                    }
-                    $key = strtolower($key);
-                    $this->$key = $val;
-                    break;
-
-                case 'BYSECOND':
-                    $this->bySecond = (array) $value;
-                    break;
-
-                case 'BYMINUTE':
-                    $this->byMinute = (array) $value;
-                    break;
-
-                case 'BYHOUR':
-                    $this->byHour = (array) $value;
-                    break;
-
-                case 'BYDAY':
-                    $value = (array) $value;
-                    foreach ($value as $part) {
-                        if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $# xi', $part)) {
-                            throw new InvalidDataException('Invalid part in BYDAY clause: '.$part);
-                        }
-                    }
-                    $this->byDay = $value;
-                    break;
-
-                case 'BYMONTHDAY':
-                    $this->byMonthDay = (array) $value;
-                    break;
-
-                case 'BYYEARDAY':
-                    $this->byYearDay = (array) $value;
-                    foreach ($this->byYearDay as $byYearDay) {
-                        if (!is_numeric($byYearDay) || (int) $byYearDay < -366 || 0 == (int) $byYearDay || (int) $byYearDay > 366) {
-                            throw new InvalidDataException('BYYEARDAY in RRULE must have value(s) from 1 to 366, or -366 to -1!');
-                        }
-                    }
-                    break;
-
-                case 'BYWEEKNO':
-                    $this->byWeekNo = (array) $value;
-                    foreach ($this->byWeekNo as $byWeekNo) {
-                        if (!is_numeric($byWeekNo) || (int) $byWeekNo < -53 || 0 == (int) $byWeekNo || (int) $byWeekNo > 53) {
-                            throw new InvalidDataException('BYWEEKNO in RRULE must have value(s) from 1 to 53, or -53 to -1!');
-                        }
-                    }
-                    break;
-
-                case 'BYMONTH':
-                    $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!');
-                        }
-                    }
-                    break;
-
-                case 'BYSETPOS':
-                    $this->bySetPos = (array) $value;
-                    break;
-
-                case 'WKST':
-                    $this->weekStart = strtoupper($value);
-                    break;
-
-                default:
-                    throw new InvalidDataException('Not supported: '.strtoupper($key));
-            }
-        }
-    }
-
-    /**
-     * Mappings between the day number and english day name.
-     *
-     * @var array
-     */
-    protected $dayNames = [
-        0 => 'Sunday',
-        1 => 'Monday',
-        2 => 'Tuesday',
-        3 => 'Wednesday',
-        4 => 'Thursday',
-        5 => 'Friday',
-        6 => 'Saturday',
-    ];
-
-    /**
-     * Returns all the occurrences for a monthly frequency with a 'byDay' or
-     * 'byMonthDay' expansion for the current month.
-     *
-     * The returned list is an array of integers with the day of month (1-31).
-     *
-     * @return array
-     */
-    protected function getMonthlyOccurrences()
-    {
-        $startDate = clone $this->currentDate;
-
-        $byDayResults = [];
-
-        // Our strategy is to simply go through the byDays, advance the date to
-        // that point and add it to the results.
-        if ($this->byDay) {
-            foreach ($this->byDay as $day) {
-                $dayName = $this->dayNames[$this->dayMap[substr($day, -2)]];
-
-                // Dayname will be something like 'wednesday'. Now we need to find
-                // all wednesdays in this month.
-                $dayHits = [];
-
-                // workaround for missing 'first day of the month' support in hhvm
-                $checkDate = new \DateTime($startDate->format('Y-m-1'));
-                // workaround modify always advancing the date even if the current day is a $dayName in hhvm
-                if ($checkDate->format('l') !== $dayName) {
-                    $checkDate = $checkDate->modify($dayName);
-                }
-
-                do {
-                    $dayHits[] = $checkDate->format('j');
-                    $checkDate = $checkDate->modify('next '.$dayName);
-                } while ($checkDate->format('n') === $startDate->format('n'));
-
-                // So now we have 'all wednesdays' for month. It is however
-                // possible that the user only really wanted the 1st, 2nd or last
-                // wednesday.
-                if (strlen($day) > 2) {
-                    $offset = (int) substr($day, 0, -2);
-
-                    if ($offset > 0) {
-                        // It is possible that the day does not exist, such as a
-                        // 5th or 6th wednesday of the month.
-                        if (isset($dayHits[$offset - 1])) {
-                            $byDayResults[] = $dayHits[$offset - 1];
-                        }
-                    } else {
-                        // if it was negative we count from the end of the array
-                        // might not exist, fx. -5th tuesday
-                        if (isset($dayHits[count($dayHits) + $offset])) {
-                            $byDayResults[] = $dayHits[count($dayHits) + $offset];
-                        }
-                    }
-                } else {
-                    // There was no counter (first, second, last wednesdays), so we
-                    // just need to add the all to the list).
-                    $byDayResults = array_merge($byDayResults, $dayHits);
-                }
-            }
-        }
-
-        $byMonthDayResults = [];
-        if ($this->byMonthDay) {
-            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')) {
-                    continue;
-                }
-                if ($monthDay > 0) {
-                    $byMonthDayResults[] = $monthDay;
-                } else {
-                    // Negative values
-                    $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
-                }
-            }
-        }
-
-        // If there was just byDay or just byMonthDay, they just specify our
-        // (almost) final list. If both were provided, then byDay limits the
-        // list.
-        if ($this->byMonthDay && $this->byDay) {
-            $result = array_intersect($byMonthDayResults, $byDayResults);
-        } elseif ($this->byMonthDay) {
-            $result = $byMonthDayResults;
-        } else {
-            $result = $byDayResults;
-        }
-        $result = array_unique($result);
-        sort($result, SORT_NUMERIC);
-
-        // The last thing that needs checking is the BYSETPOS. If it's set, it
-        // means only certain items in the set survive the filter.
-        if (!$this->bySetPos) {
-            return $result;
-        }
-
-        $filteredResult = [];
-        foreach ($this->bySetPos as $setPos) {
-            if ($setPos < 0) {
-                $setPos = count($result) + ($setPos + 1);
-            }
-            if (isset($result[$setPos - 1])) {
-                $filteredResult[] = $result[$setPos - 1];
-            }
-        }
-
-        sort($filteredResult, SORT_NUMERIC);
-
-        return $filteredResult;
-    }
-
-    /**
-     * Simple mapping from iCalendar day names to day numbers.
-     *
-     * @var array
-     */
-    protected $dayMap = [
-        'SU' => 0,
-        'MO' => 1,
-        'TU' => 2,
-        'WE' => 3,
-        'TH' => 4,
-        'FR' => 5,
-        'SA' => 6,
-    ];
-
-    protected function getHours()
-    {
-        $recurrenceHours = [];
-        foreach ($this->byHour as $byHour) {
-            $recurrenceHours[] = $byHour;
-        }
-
-        return $recurrenceHours;
-    }
-
-    protected function getDays()
-    {
-        $recurrenceDays = [];
-        foreach ($this->byDay as $byDay) {
-            // The day may be preceded 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)];
-        }
-
-        return $recurrenceDays;
-    }
-
-    protected function getMonths()
-    {
-        $recurrenceMonths = [];
-        foreach ($this->byMonth as $byMonth) {
-            $recurrenceMonths[] = $byMonth;
-        }
-
-        return $recurrenceMonths;
-    }
+	/**
+	 * Constant denoting the upper limit on how long into the future
+	 * we want to iterate. The value is a unix timestamp and currently
+	 * corresponds to the datetime 9999-12-31 11:59:59 UTC.
+	 */
+	const dateUpperLimit = 253402300799;
+
+	/**
+	 * Creates the Iterator.
+	 *
+	 * @param string|array $rrule
+	 */
+	public function __construct($rrule, DateTimeInterface $start)
+	{
+		$this->startDate = $start;
+		$this->parseRRule($rrule);
+		$this->currentDate = clone $this->startDate;
+	}
+
+	/* Implementation of the Iterator interface {{{ */
+
+	#[\ReturnTypeWillChange]
+	public function current()
+	{
+		if (!$this->valid()) {
+			return;
+		}
+
+		return clone $this->currentDate;
+	}
+
+	/**
+	 * Returns the current item number.
+	 *
+	 * @return int
+	 */
+	#[\ReturnTypeWillChange]
+	public function key()
+	{
+		return $this->counter;
+	}
+
+	/**
+	 * Returns whether the current item is a valid item for the recurrence
+	 * iterator. This will return false if we've gone beyond the UNTIL or COUNT
+	 * statements.
+	 *
+	 * @return bool
+	 */
+	#[\ReturnTypeWillChange]
+	public function valid()
+	{
+		if (null === $this->currentDate) {
+			return false;
+		}
+		if (!is_null($this->count)) {
+			return $this->counter < $this->count;
+		}
+
+		return is_null($this->until) || $this->currentDate <= $this->until;
+	}
+
+	/**
+	 * Resets the iterator.
+	 *
+	 * @return void
+	 */
+	#[\ReturnTypeWillChange]
+	public function rewind()
+	{
+		$this->currentDate = clone $this->startDate;
+		$this->counter = 0;
+	}
+
+	/**
+	 * Goes on to the next iteration.
+	 *
+	 * @return void
+	 */
+	#[\ReturnTypeWillChange]
+	public function next()
+	{
+		// Otherwise, we find the next event in the normal RRULE
+		// sequence.
+		switch ($this->frequency) {
+			case 'hourly':
+				$this->nextHourly();
+				break;
+
+			case 'daily':
+				$this->nextDaily();
+				break;
+
+			case 'weekly':
+				$this->nextWeekly();
+				break;
+
+			case 'monthly':
+				$this->nextMonthly();
+				break;
+
+			case 'yearly':
+				$this->nextYearly();
+				break;
+		}
+		++$this->counter;
+	}
+
+	/* End of Iterator implementation }}} */
+
+	/**
+	 * Returns true if this recurring event never ends.
+	 *
+	 * @return bool
+	 */
+	public function isInfinite()
+	{
+		return !$this->count && !$this->until;
+	}
+
+	/**
+	 * This method allows you to quickly go to the next occurrence after the
+	 * specified date.
+	 */
+	public function fastForward(DateTimeInterface $dt)
+	{
+		while ($this->valid() && $this->currentDate < $dt) {
+			$this->next();
+		}
+	}
+
+	/**
+	 * The reference start date/time for the rrule.
+	 *
+	 * All calculations are based on this initial date.
+	 *
+	 * @var DateTimeInterface
+	 */
+	protected $startDate;
+
+	/**
+	 * The date of the current iteration. You can get this by calling
+	 * ->current().
+	 *
+	 * @var DateTimeInterface
+	 */
+	protected $currentDate;
+
+	/**
+	 * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
+	 * yearly.
+	 *
+	 * @var string
+	 */
+	protected $frequency;
+
+	/**
+	 * The number of recurrences, or 'null' if infinitely recurring.
+	 *
+	 * @var int
+	 */
+	protected $count;
+
+	/**
+	 * The interval.
+	 *
+	 * If for example frequency is set to daily, interval = 2 would mean every
+	 * 2 days.
+	 *
+	 * @var int
+	 */
+	protected $interval = 1;
+
+	/**
+	 * The last instance of this recurrence, inclusively.
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	protected $until;
+
+	/**
+	 * Which seconds to recur.
+	 *
+	 * This is an array of integers (between 0 and 60)
+	 *
+	 * @var array
+	 */
+	protected $bySecond;
+
+	/**
+	 * Which minutes to recur.
+	 *
+	 * This is an array of integers (between 0 and 59)
+	 *
+	 * @var array
+	 */
+	protected $byMinute;
+
+	/**
+	 * Which hours to recur.
+	 *
+	 * This is an array of integers (between 0 and 23)
+	 *
+	 * @var array
+	 */
+	protected $byHour;
+
+	/**
+	 * The current item in the list.
+	 *
+	 * You can get this number with the key() method.
+	 *
+	 * @var int
+	 */
+	protected $counter = 0;
+
+	/**
+	 * Which weekdays to recur.
+	 *
+	 * This is an array of weekdays
+	 *
+	 * This may also be preceded 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.
+	 *
+	 * @var array
+	 */
+	protected $byDay;
+
+	/**
+	 * Which days of the month to recur.
+	 *
+	 * This is an array of days of the months (1-31). The value can also be
+	 * negative. -5 for instance means the 5th last day of the month.
+	 *
+	 * @var array
+	 */
+	protected $byMonthDay;
+
+	/**
+	 * Which days of the year to recur.
+	 *
+	 * This is an array with days of the year (1 to 366). The values can also
+	 * be negative. For instance, -1 will always represent the last day of the
+	 * year. (December 31st).
+	 *
+	 * @var array
+	 */
+	protected $byYearDay;
+
+	/**
+	 * Which week numbers to recur.
+	 *
+	 * This is an array of integers from 1 to 53. The values can also be
+	 * negative. -1 will always refer to the last week of the year.
+	 *
+	 * @var array
+	 */
+	protected $byWeekNo;
+
+	/**
+	 * Which months to recur.
+	 *
+	 * This is an array of integers from 1 to 12.
+	 *
+	 * @var array
+	 */
+	protected $byMonth;
+
+	/**
+	 * Which items in an existing st to recur.
+	 *
+	 * These numbers work together with an existing by* rule. It specifies
+	 * exactly which items of the existing by-rule to filter.
+	 *
+	 * Valid values are 1 to 366 and -1 to -366. As an example, this can be
+	 * used to recur the last workday of the month.
+	 *
+	 * This would be done by setting frequency to 'monthly', byDay to
+	 * 'MO,TU,WE,TH,FR' and bySetPos to -1.
+	 *
+	 * @var array
+	 */
+	protected $bySetPos;
+
+	/**
+	 * When the week starts.
+	 *
+	 * @var string
+	 */
+	protected $weekStart = 'MO';
+
+	/* Functions that advance the iterator {{{ */
+
+	/**
+	 * Does the processing for advancing the iterator for hourly frequency.
+	 */
+	protected function nextHourly()
+	{
+		$this->currentDate = $this->currentDate->modify('+'.$this->interval.' hours');
+	}
+
+	/**
+	 * Does the processing for advancing the iterator for daily frequency.
+	 */
+	protected function nextDaily()
+	{
+		if (!$this->byHour && !$this->byDay) {
+			$this->currentDate = $this->currentDate->modify('+'.$this->interval.' days');
+
+			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();
+		}
+
+		do {
+			if ($this->byHour) {
+				if ('23' == $this->currentDate->format('G')) {
+					// to obey the interval rule
+					$this->currentDate = $this->currentDate->modify('+'.($this->interval - 1).' days');
+				}
+
+				$this->currentDate = $this->currentDate->modify('+1 hours');
+			} else {
+				$this->currentDate = $this->currentDate->modify('+'.$this->interval.' days');
+			}
+
+			// Current month of the year
+			$currentMonth = $this->currentDate->format('n');
+
+			// Current day of the week
+			$currentDay = $this->currentDate->format('w');
+
+			// Current hour of the day
+			$currentHour = $this->currentDate->format('G');
+
+			if ($this->currentDate->getTimestamp() > self::dateUpperLimit) {
+				$this->currentDate = null;
+
+				return;
+			}
+		} while (
+			($this->byDay && !in_array($currentDay, $recurrenceDays)) ||
+			($this->byHour && !in_array($currentHour, $recurrenceHours)) ||
+			($this->byMonth && !in_array($currentMonth, $recurrenceMonths))
+		);
+	}
+
+	/**
+	 * Does the processing for advancing the iterator for weekly frequency.
+	 */
+	protected function nextWeekly()
+	{
+		if (!$this->byHour && !$this->byDay) {
+			$this->currentDate = $this->currentDate->modify('+'.$this->interval.' weeks');
+
+			return;
+		}
+
+		$recurrenceHours = [];
+		if ($this->byHour) {
+			$recurrenceHours = $this->getHours();
+		}
+
+		$recurrenceDays = [];
+		if ($this->byDay) {
+			$recurrenceDays = $this->getDays();
+		}
+
+		// First day of the week:
+		$firstDay = $this->dayMap[$this->weekStart];
+
+		do {
+			if ($this->byHour) {
+				$this->currentDate = $this->currentDate->modify('+1 hours');
+			} else {
+				$this->currentDate = $this->currentDate->modify('+1 days');
+			}
+
+			// Current day of the week
+			$currentDay = (int) $this->currentDate->format('w');
+
+			// Current hour of the day
+			$currentHour = (int) $this->currentDate->format('G');
+
+			// We need to roll over to the next week
+			if ($currentDay === $firstDay && (!$this->byHour || '0' == $currentHour)) {
+				$this->currentDate = $this->currentDate->modify('+'.($this->interval - 1).' weeks');
+
+				// We need to go to the first day of this week, but only if we
+				// are not already on this first day of this week.
+				if ($this->currentDate->format('w') != $firstDay) {
+					$this->currentDate = $this->currentDate->modify('last '.$this->dayNames[$this->dayMap[$this->weekStart]]);
+				}
+			}
+
+			// We have a match
+		} while (($this->byDay && !in_array($currentDay, $recurrenceDays)) || ($this->byHour && !in_array($currentHour, $recurrenceHours)));
+	}
+
+	/**
+	 * Does the processing for advancing the iterator for monthly frequency.
+	 */
+	protected function nextMonthly()
+	{
+		$currentDayOfMonth = $this->currentDate->format('j');
+		if (!$this->byMonthDay && !$this->byDay) {
+			// If the current day is higher than the 28th, rollover can
+			// occur to the next month. We Must skip these invalid
+			// entries.
+			if ($currentDayOfMonth < 29) {
+				$this->currentDate = $this->currentDate->modify('+'.$this->interval.' months');
+			} else {
+				$increase = 0;
+				do {
+					++$increase;
+					$tempDate = clone $this->currentDate;
+					$tempDate = $tempDate->modify('+ '.($this->interval * $increase).' months');
+				} while ($tempDate->format('j') != $currentDayOfMonth);
+				$this->currentDate = $tempDate;
+			}
+
+			return;
+		}
+
+		$occurrence = -1;
+		while (true) {
+			$occurrences = $this->getMonthlyOccurrences();
+
+			foreach ($occurrences as $occurrence) {
+				// The first occurrence thats higher than the current
+				// day of the month wins.
+				if ($occurrence > $currentDayOfMonth) {
+					break 2;
+				}
+			}
+
+			// If we made it all the way here, it means there were no
+			// valid occurrences, and we need to advance to the next
+			// month.
+			//
+			// This line does not currently work in hhvm. Temporary workaround
+			// follows:
+			// $this->currentDate->modify('first day of this month');
+			$this->currentDate = new DateTimeImmutable($this->currentDate->format('Y-m-1 H:i:s'), $this->currentDate->getTimezone());
+			// end of workaround
+			$this->currentDate = $this->currentDate->modify('+ '.$this->interval.' months');
+
+			// 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
+			// 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() > self::dateUpperLimit) {
+				$this->currentDate = null;
+
+				return;
+			}
+		}
+
+		$this->currentDate = $this->currentDate->setDate(
+			(int) $this->currentDate->format('Y'),
+			(int) $this->currentDate->format('n'),
+			(int) $occurrence
+		);
+	}
+
+	/**
+	 * Does the processing for advancing the iterator for yearly frequency.
+	 */
+	protected function nextYearly()
+	{
+		$currentMonth = $this->currentDate->format('n');
+		$currentYear = $this->currentDate->format('Y');
+		$currentDayOfMonth = $this->currentDate->format('j');
+
+		// No sub-rules, so we just advance by year
+		if (empty($this->byMonth)) {
+			// Unless it was a leap day!
+			if (2 == $currentMonth && 29 == $currentDayOfMonth) {
+				$counter = 0;
+				do {
+					++$counter;
+					// Here we increase the year count by the interval, until
+					// we hit a date that's also in a leap year.
+					//
+					// We could just find the next interval that's dividable by
+					// 4, but that would ignore the rule that there's no leap
+					// year every year that's dividable by a 100, but not by
+					// 400. (1800, 1900, 2100). So we just rely on the datetime
+					// functions instead.
+					$nextDate = clone $this->currentDate;
+					$nextDate = $nextDate->modify('+ '.($this->interval * $counter).' years');
+				} while (2 != $nextDate->format('n'));
+
+				$this->currentDate = $nextDate;
+
+				return;
+			}
+
+			if (null !== $this->byWeekNo) { // byWeekNo is an array with values from -53 to -1, or 1 to 53
+				$dayOffsets = [];
+				if ($this->byDay) {
+					foreach ($this->byDay as $byDay) {
+						$dayOffsets[] = $this->dayMap[$byDay];
+					}
+				} else {   // default is Monday
+					$dayOffsets[] = 1;
+				}
+
+				$currentYear = $this->currentDate->format('Y');
+
+				while (true) {
+					$checkDates = [];
+
+					// loop through all WeekNo and Days to check all the combinations
+					foreach ($this->byWeekNo as $byWeekNo) {
+						foreach ($dayOffsets as $dayOffset) {
+							$date = clone $this->currentDate;
+							$date = $date->setISODate($currentYear, $byWeekNo, $dayOffset);
+
+							if ($date > $this->currentDate) {
+								$checkDates[] = $date;
+							}
+						}
+					}
+
+					if (count($checkDates) > 0) {
+						$this->currentDate = min($checkDates);
+
+						return;
+					}
+
+					// if there is no date found, check the next year
+					$currentYear += $this->interval;
+				}
+			}
+
+			if (null !== $this->byYearDay) { // byYearDay is an array with values from -366 to -1, or 1 to 366
+				$dayOffsets = [];
+				if ($this->byDay) {
+					foreach ($this->byDay as $byDay) {
+						$dayOffsets[] = $this->dayMap[$byDay];
+					}
+				} else {   // default is Monday-Sunday
+					$dayOffsets = [1, 2, 3, 4, 5, 6, 7];
+				}
+
+				$currentYear = $this->currentDate->format('Y');
+
+				while (true) {
+					$checkDates = [];
+
+					// loop through all YearDay and Days to check all the combinations
+					foreach ($this->byYearDay as $byYearDay) {
+						$date = clone $this->currentDate;
+						if ($byYearDay > 0) {
+							$date = $date->setDate($currentYear, 1, 1);
+							$date = $date->add(new \DateInterval('P'.($byYearDay - 1).'D'));
+						} else {
+							$date = $date->setDate($currentYear, 12, 31);
+							$date = $date->sub(new \DateInterval('P'.abs($byYearDay + 1).'D'));
+						}
+
+						if ($date > $this->currentDate && in_array($date->format('N'), $dayOffsets)) {
+							$checkDates[] = $date;
+						}
+					}
+
+					if (count($checkDates) > 0) {
+						$this->currentDate = min($checkDates);
+
+						return;
+					}
+
+					// if there is no date found, check the next year
+					$currentYear += $this->interval;
+				}
+			}
+
+			// The easiest form
+			$this->currentDate = $this->currentDate->modify('+'.$this->interval.' years');
+
+			return;
+		}
+
+		$currentMonth = $this->currentDate->format('n');
+		$currentYear = $this->currentDate->format('Y');
+		$currentDayOfMonth = $this->currentDate->format('j');
+
+		$advancedToNewMonth = false;
+
+		// 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();
+
+				foreach ($occurrences as $occurrence) {
+					// The first occurrence that's higher than the current
+					// day of the month wins.
+					// If we advanced to the next month or year, the first
+					// occurrence is always correct.
+					if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
+						break 2;
+					}
+				}
+
+				// If we made it here, it means we need to advance to
+				// the next month or year.
+				$currentDayOfMonth = 1;
+				$advancedToNewMonth = true;
+				do {
+					++$currentMonth;
+					if ($currentMonth > 12) {
+						$currentYear += $this->interval;
+						$currentMonth = 1;
+					}
+				} while (!in_array($currentMonth, $this->byMonth));
+
+				$this->currentDate = $this->currentDate->setDate(
+					(int) $currentYear,
+					(int) $currentMonth,
+					(int) $currentDayOfMonth
+				);
+
+				// 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() > self::dateUpperLimit) {
+					$this->currentDate = null;
+
+					return;
+				}
+			}
+
+			// If we made it here, it means we got a valid occurrence
+			$this->currentDate = $this->currentDate->setDate(
+				(int) $currentYear,
+				(int) $currentMonth,
+				(int) $occurrence
+			);
+
+			return;
+		} else {
+			// These are the 'byMonth' rules, if there are no byDay or
+			// byMonthDay sub-rules.
+			do {
+				++$currentMonth;
+				if ($currentMonth > 12) {
+					$currentYear += $this->interval;
+					$currentMonth = 1;
+				}
+			} while (!in_array($currentMonth, $this->byMonth));
+			$this->currentDate = $this->currentDate->setDate(
+				(int) $currentYear,
+				(int) $currentMonth,
+				(int) $currentDayOfMonth
+			);
+
+			return;
+		}
+	}
+
+	/* }}} */
+
+	/**
+	 * This method receives a string from an RRULE property, and populates this
+	 * class with all the values.
+	 *
+	 * @param string|array $rrule
+	 */
+	protected function parseRRule($rrule)
+	{
+		if (is_string($rrule)) {
+			$rrule = Property\ICalendar\Recur::stringToArray($rrule);
+		}
+
+		foreach ($rrule as $key => $value) {
+			$key = strtoupper($key);
+			switch ($key) {
+				case 'FREQ':
+					$value = strtolower($value);
+					if (!in_array(
+						$value,
+						['secondly', 'minutely', 'hourly', 'daily', 'weekly', 'monthly', 'yearly']
+					)) {
+						throw new InvalidDataException('Unknown value for FREQ='.strtoupper($value));
+					}
+					$this->frequency = $value;
+					break;
+
+				case 'UNTIL':
+					$this->until = DateTimeParser::parse($value, $this->startDate->getTimezone());
+
+					// In some cases events are generated with an UNTIL=
+					// parameter before the actual start of the event.
+					//
+					// Not sure why this is happening. We assume that the
+					// intention was that the event only recurs once.
+					//
+					// So we are modifying the parameter so our code doesn't
+					// break.
+					if ($this->until < $this->startDate) {
+						$this->until = $this->startDate;
+					}
+					break;
+
+				case 'INTERVAL':
+				case 'COUNT':
+					$val = (int) $value;
+					if ($val < 1) {
+						throw new InvalidDataException(strtoupper($key).' in RRULE must be a positive integer!');
+					}
+					$key = strtolower($key);
+					$this->$key = $val;
+					break;
+
+				case 'BYSECOND':
+					$this->bySecond = (array) $value;
+					break;
+
+				case 'BYMINUTE':
+					$this->byMinute = (array) $value;
+					break;
+
+				case 'BYHOUR':
+					$this->byHour = (array) $value;
+					break;
+
+				case 'BYDAY':
+					$value = (array) $value;
+					foreach ($value as $part) {
+						if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $# xi', $part)) {
+							throw new InvalidDataException('Invalid part in BYDAY clause: '.$part);
+						}
+					}
+					$this->byDay = $value;
+					break;
+
+				case 'BYMONTHDAY':
+					$this->byMonthDay = (array) $value;
+					break;
+
+				case 'BYYEARDAY':
+					$this->byYearDay = (array) $value;
+					foreach ($this->byYearDay as $byYearDay) {
+						if (!is_numeric($byYearDay) || (int) $byYearDay < -366 || 0 == (int) $byYearDay || (int) $byYearDay > 366) {
+							throw new InvalidDataException('BYYEARDAY in RRULE must have value(s) from 1 to 366, or -366 to -1!');
+						}
+					}
+					break;
+
+				case 'BYWEEKNO':
+					$this->byWeekNo = (array) $value;
+					foreach ($this->byWeekNo as $byWeekNo) {
+						if (!is_numeric($byWeekNo) || (int) $byWeekNo < -53 || 0 == (int) $byWeekNo || (int) $byWeekNo > 53) {
+							throw new InvalidDataException('BYWEEKNO in RRULE must have value(s) from 1 to 53, or -53 to -1!');
+						}
+					}
+					break;
+
+				case 'BYMONTH':
+					$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!');
+						}
+					}
+					break;
+
+				case 'BYSETPOS':
+					$this->bySetPos = (array) $value;
+					break;
+
+				case 'WKST':
+					$this->weekStart = strtoupper($value);
+					break;
+
+				default:
+					throw new InvalidDataException('Not supported: '.strtoupper($key));
+			}
+		}
+	}
+
+	/**
+	 * Mappings between the day number and english day name.
+	 *
+	 * @var array
+	 */
+	protected $dayNames = [
+		0 => 'Sunday',
+		1 => 'Monday',
+		2 => 'Tuesday',
+		3 => 'Wednesday',
+		4 => 'Thursday',
+		5 => 'Friday',
+		6 => 'Saturday',
+	];
+
+	/**
+	 * Returns all the occurrences for a monthly frequency with a 'byDay' or
+	 * 'byMonthDay' expansion for the current month.
+	 *
+	 * The returned list is an array of integers with the day of month (1-31).
+	 *
+	 * @return array
+	 */
+	protected function getMonthlyOccurrences()
+	{
+		$startDate = clone $this->currentDate;
+
+		$byDayResults = [];
+
+		// Our strategy is to simply go through the byDays, advance the date to
+		// that point and add it to the results.
+		if ($this->byDay) {
+			foreach ($this->byDay as $day) {
+				$dayName = $this->dayNames[$this->dayMap[substr($day, -2)]];
+
+				// Dayname will be something like 'wednesday'. Now we need to find
+				// all wednesdays in this month.
+				$dayHits = [];
+
+				// workaround for missing 'first day of the month' support in hhvm
+				$checkDate = new \DateTime($startDate->format('Y-m-1'));
+				// workaround modify always advancing the date even if the current day is a $dayName in hhvm
+				if ($checkDate->format('l') !== $dayName) {
+					$checkDate = $checkDate->modify($dayName);
+				}
+
+				do {
+					$dayHits[] = $checkDate->format('j');
+					$checkDate = $checkDate->modify('next '.$dayName);
+				} while ($checkDate->format('n') === $startDate->format('n'));
+
+				// So now we have 'all wednesdays' for month. It is however
+				// possible that the user only really wanted the 1st, 2nd or last
+				// wednesday.
+				if (strlen($day) > 2) {
+					$offset = (int) substr($day, 0, -2);
+
+					if ($offset > 0) {
+						// It is possible that the day does not exist, such as a
+						// 5th or 6th wednesday of the month.
+						if (isset($dayHits[$offset - 1])) {
+							$byDayResults[] = $dayHits[$offset - 1];
+						}
+					} else {
+						// if it was negative we count from the end of the array
+						// might not exist, fx. -5th tuesday
+						if (isset($dayHits[count($dayHits) + $offset])) {
+							$byDayResults[] = $dayHits[count($dayHits) + $offset];
+						}
+					}
+				} else {
+					// There was no counter (first, second, last wednesdays), so we
+					// just need to add the all to the list).
+					$byDayResults = array_merge($byDayResults, $dayHits);
+				}
+			}
+		}
+
+		$byMonthDayResults = [];
+		if ($this->byMonthDay) {
+			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')) {
+					continue;
+				}
+				if ($monthDay > 0) {
+					$byMonthDayResults[] = $monthDay;
+				} else {
+					// Negative values
+					$byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
+				}
+			}
+		}
+
+		// If there was just byDay or just byMonthDay, they just specify our
+		// (almost) final list. If both were provided, then byDay limits the
+		// list.
+		if ($this->byMonthDay && $this->byDay) {
+			$result = array_intersect($byMonthDayResults, $byDayResults);
+		} elseif ($this->byMonthDay) {
+			$result = $byMonthDayResults;
+		} else {
+			$result = $byDayResults;
+		}
+		$result = array_unique($result);
+		sort($result, SORT_NUMERIC);
+
+		// The last thing that needs checking is the BYSETPOS. If it's set, it
+		// means only certain items in the set survive the filter.
+		if (!$this->bySetPos) {
+			return $result;
+		}
+
+		$filteredResult = [];
+		foreach ($this->bySetPos as $setPos) {
+			if ($setPos < 0) {
+				$setPos = count($result) + ($setPos + 1);
+			}
+			if (isset($result[$setPos - 1])) {
+				$filteredResult[] = $result[$setPos - 1];
+			}
+		}
+
+		sort($filteredResult, SORT_NUMERIC);
+
+		return $filteredResult;
+	}
+
+	/**
+	 * Simple mapping from iCalendar day names to day numbers.
+	 *
+	 * @var array
+	 */
+	protected $dayMap = [
+		'SU' => 0,
+		'MO' => 1,
+		'TU' => 2,
+		'WE' => 3,
+		'TH' => 4,
+		'FR' => 5,
+		'SA' => 6,
+	];
+
+	protected function getHours()
+	{
+		$recurrenceHours = [];
+		foreach ($this->byHour as $byHour) {
+			$recurrenceHours[] = $byHour;
+		}
+
+		return $recurrenceHours;
+	}
+
+	protected function getDays()
+	{
+		$recurrenceDays = [];
+		foreach ($this->byDay as $byDay) {
+			// The day may be preceded 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)];
+		}
+
+		return $recurrenceDays;
+	}
+
+	protected function getMonths()
+	{
+		$recurrenceMonths = [];
+		foreach ($this->byMonth as $byMonth) {
+			$recurrenceMonths[] = $byMonth;
+		}
+
+		return $recurrenceMonths;
+	}
 }