YetiForceCompany / YetiForceCRM

libraries/SabreDAV/VObject/Recur/EventIterator.php

Indentation +445 added lines, -445 removed lines

@@ -58,450 +58,450 @@
  */
 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 recomended. 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
-     */
-    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;
-        }
-        $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 it's 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
-     */
-    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
-     */
-    public function valid() {
-
-        if ($this->counter > Settings::$maxRecurrences && Settings::$maxRecurrences !== -1) {
-            throw new MaxInstancesExceededException('Recurring events are only allowed to generate ' . Settings::$maxRecurrences);
-        }
-        return !!$this->currentDate;
-
-    }
-
-    /**
-     * Sets the iterator back to the starting point.
-     */
-    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
-     */
-    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) {
-
-            $offset = end($this->overriddenEventsIndex);
-            $timestamp = key($this->overriddenEventsIndex);
-            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);
-
-                // Exit point!
-                return;
-
-            }
-
-        }
-
-        $this->currentDate = $nextDate;
-
-    }
-
-    /**
-     * Quickly jump to a date in the future.
-     *
-     * @param DateTimeInterface $dateTime
-     */
-    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 index 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 recomended. 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
+	 */
+	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;
+		}
+		$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 it's 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
+	 */
+	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
+	 */
+	public function valid() {
+
+		if ($this->counter > Settings::$maxRecurrences && Settings::$maxRecurrences !== -1) {
+			throw new MaxInstancesExceededException('Recurring events are only allowed to generate ' . Settings::$maxRecurrences);
+		}
+		return !!$this->currentDate;
+
+	}
+
+	/**
+	 * Sets the iterator back to the starting point.
+	 */
+	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
+	 */
+	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) {
+
+			$offset = end($this->overriddenEventsIndex);
+			$timestamp = key($this->overriddenEventsIndex);
+			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);
+
+				// Exit point!
+				return;
+
+			}
+
+		}
+
+		$this->currentDate = $nextDate;
+
+	}
+
+	/**
+	 * Quickly jump to a date in the future.
+	 *
+	 * @param DateTimeInterface $dateTime
+	 */
+	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 index 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;
 
 }

libraries/SabreDAV/VObject/Recur/RDateIterator.php

Indentation +155 added lines, -155 removed lines

@@ -21,162 +21,162 @@
  */
 class RDateIterator implements Iterator {
 
-    /**
-     * Creates the Iterator.
-     *
-     * @param string|array $rrule
-     * @param DateTimeInterface $start
-     */
-    public function __construct($rrule, DateTimeInterface $start) {
+	/**
+	 * Creates the Iterator.
+	 *
+	 * @param string|array $rrule
+	 * @param DateTimeInterface $start
+	 */
+	public function __construct($rrule, DateTimeInterface $start) {
 
-        $this->startDate = $start;
-        $this->parseRDate($rrule);
-        $this->currentDate = clone $this->startDate;
-
-    }
+		$this->startDate = $start;
+		$this->parseRDate($rrule);
+		$this->currentDate = clone $this->startDate;
+
+	}
 
-    /* Implementation of the Iterator interface {{{ */
-
-    public function current() {
-
-        if (!$this->valid()) return;
-        return clone $this->currentDate;
-
-    }
-
-    /**
-     * Returns the current item number.
-     *
-     * @return int
-     */
-    public function key() {
-
-        return $this->counter;
-
-    }
-
-    /**
-     * Returns whether the current item is a valid item for the recurrence
-     * iterator.
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        return ($this->counter <= count($this->dates));
-
-    }
-
-    /**
-     * Resets the iterator.
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->currentDate = clone $this->startDate;
-        $this->counter = 0;
-
-    }
-
-    /**
-     * Goes on to the next iteration.
-     *
-     * @return void
-     */
-    public function next() {
-
-        $this->counter++;
-        if (!$this->valid()) return;
-
-        $this->currentDate =
-            DateTimeParser::parse(
-                $this->dates[$this->counter - 1],
-                $this->startDate->getTimezone()
-            );
-
-    }
-
-    /* End of Iterator implementation }}} */
-
-    /**
-     * Returns true if this recurring event never ends.
-     *
-     * @return bool
-     */
-    public function isInfinite() {
-
-        return false;
-
-    }
-
-    /**
-     * This method allows you to quickly go to the next occurrence after the
-     * specified date.
-     *
-     * @param DateTimeInterface $dt
-     *
-     * @return void
-     */
-    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;
-
-    /**
-     * The current item in the list.
-     *
-     * You can get this number with the key() method.
-     *
-     * @var int
-     */
-    protected $counter = 0;
-
-    /* }}} */
-
-    /**
-     * This method receives a string from an RRULE property, and populates this
-     * class with all the values.
-     *
-     * @param string|array $rrule
-     *
-     * @return void
-     */
-    protected function parseRDate($rdate) {
-
-        if (is_string($rdate)) {
-            $rdate = explode(',', $rdate);
-        }
-
-        $this->dates = $rdate;
-
-    }
-
-    /**
-     * Array with the RRULE dates
-     *
-     * @var array
-     */
-    protected $dates = [];
+	/* Implementation of the Iterator interface {{{ */
+
+	public function current() {
+
+		if (!$this->valid()) return;
+		return clone $this->currentDate;
+
+	}
+
+	/**
+	 * Returns the current item number.
+	 *
+	 * @return int
+	 */
+	public function key() {
+
+		return $this->counter;
+
+	}
+
+	/**
+	 * Returns whether the current item is a valid item for the recurrence
+	 * iterator.
+	 *
+	 * @return bool
+	 */
+	public function valid() {
+
+		return ($this->counter <= count($this->dates));
+
+	}
+
+	/**
+	 * Resets the iterator.
+	 *
+	 * @return void
+	 */
+	public function rewind() {
+
+		$this->currentDate = clone $this->startDate;
+		$this->counter = 0;
+
+	}
+
+	/**
+	 * Goes on to the next iteration.
+	 *
+	 * @return void
+	 */
+	public function next() {
+
+		$this->counter++;
+		if (!$this->valid()) return;
+
+		$this->currentDate =
+			DateTimeParser::parse(
+				$this->dates[$this->counter - 1],
+				$this->startDate->getTimezone()
+			);
+
+	}
+
+	/* End of Iterator implementation }}} */
+
+	/**
+	 * Returns true if this recurring event never ends.
+	 *
+	 * @return bool
+	 */
+	public function isInfinite() {
+
+		return false;
+
+	}
+
+	/**
+	 * This method allows you to quickly go to the next occurrence after the
+	 * specified date.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return void
+	 */
+	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;
+
+	/**
+	 * The current item in the list.
+	 *
+	 * You can get this number with the key() method.
+	 *
+	 * @var int
+	 */
+	protected $counter = 0;
+
+	/* }}} */
+
+	/**
+	 * This method receives a string from an RRULE property, and populates this
+	 * class with all the values.
+	 *
+	 * @param string|array $rrule
+	 *
+	 * @return void
+	 */
+	protected function parseRDate($rdate) {
+
+		if (is_string($rdate)) {
+			$rdate = explode(',', $rdate);
+		}
+
+		$this->dates = $rdate;
+
+	}
+
+	/**
+	 * Array with the RRULE dates
+	 *
+	 * @var array
+	 */
+	protected $dates = [];
 
 }

libraries/SabreDAV/VObject/FreeBusyGenerator.php

Indentation +553 added lines, -553 removed lines

@@ -25,580 +25,580 @@
  */
 class FreeBusyGenerator {
 
-    /**
-     * Input objects.
-     *
-     * @var array
-     */
-    protected $objects = [];
-
-    /**
-     * Start of range.
-     *
-     * @var DateTimeInterface|null
-     */
-    protected $start;
-
-    /**
-     * End of range.
-     *
-     * @var DateTimeInterface|null
-     */
-    protected $end;
-
-    /**
-     * VCALENDAR object.
-     *
-     * @var Document
-     */
-    protected $baseObject;
-
-    /**
-     * Reference timezone.
-     *
-     * When we are calculating busy times, and we come across so-called
-     * floating times (times without a timezone), we use the reference timezone
-     * instead.
-     *
-     * This is also used for all-day events.
-     *
-     * This defaults to UTC.
-     *
-     * @var DateTimeZone
-     */
-    protected $timeZone;
-
-    /**
-     * A VAVAILABILITY document.
-     *
-     * If this is set, it's information will be included when calculating
-     * freebusy time.
-     *
-     * @var Document
-     */
-    protected $vavailability;
-
-    /**
-     * Creates the generator.
-     *
-     * Check the setTimeRange and setObjects methods for details about the
-     * arguments.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     * @param mixed $objects
-     * @param DateTimeZone $timeZone
-     */
-    public function __construct(DateTimeInterface $start = null, DateTimeInterface $end = null, $objects = null, DateTimeZone $timeZone = null) {
-
-        $this->setTimeRange($start, $end);
-
-        if ($objects) {
-            $this->setObjects($objects);
-        }
-        if (is_null($timeZone)) {
-            $timeZone = new DateTimeZone('UTC');
-        }
-        $this->setTimeZone($timeZone);
-
-    }
-
-    /**
-     * Sets the VCALENDAR object.
-     *
-     * If this is set, it will not be generated for you. You are responsible
-     * for setting things like the METHOD, CALSCALE, VERSION, etc..
-     *
-     * The VFREEBUSY object will be automatically added though.
-     *
-     * @param Document $vcalendar
-     * @return void
-     */
-    public function setBaseObject(Document $vcalendar) {
-
-        $this->baseObject = $vcalendar;
-
-    }
-
-    /**
-     * Sets a VAVAILABILITY document.
-     *
-     * @param Document $vcalendar
-     * @return void
-     */
-    public function setVAvailability(Document $vcalendar) {
-
-        $this->vavailability = $vcalendar;
-
-    }
-
-    /**
-     * Sets the input objects.
-     *
-     * You must either specify a valendar object as a string, or as the parse
-     * Component.
-     * It's also possible to specify multiple objects as an array.
-     *
-     * @param mixed $objects
-     *
-     * @return void
-     */
-    public function setObjects($objects) {
-
-        if (!is_array($objects)) {
-            $objects = [$objects];
-        }
-
-        $this->objects = [];
-        foreach ($objects as $object) {
-
-            if (is_string($object)) {
-                $this->objects[] = Reader::read($object);
-            } elseif ($object instanceof Component) {
-                $this->objects[] = $object;
-            } else {
-                throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
-            }
-
-        }
-
-    }
-
-    /**
-     * Sets the time range.
-     *
-     * Any freebusy object falling outside of this time range will be ignored.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     *
-     * @return void
-     */
-    public function setTimeRange(DateTimeInterface $start = null, DateTimeInterface $end = null) {
-
-        if (!$start) {
-            $start = new DateTimeImmutable(Settings::$minDate);
-        }
-        if (!$end) {
-            $end = new DateTimeImmutable(Settings::$maxDate);
-        }
-        $this->start = $start;
-        $this->end = $end;
-
-    }
-
-    /**
-     * Sets the reference timezone for floating times.
-     *
-     * @param DateTimeZone $timeZone
-     *
-     * @return void
-     */
-    public function setTimeZone(DateTimeZone $timeZone) {
-
-        $this->timeZone = $timeZone;
-
-    }
-
-    /**
-     * Parses the input data and returns a correct VFREEBUSY object, wrapped in
-     * a VCALENDAR.
-     *
-     * @return Component
-     */
-    public function getResult() {
-
-        $fbData = new FreeBusyData(
-            $this->start->getTimeStamp(),
-            $this->end->getTimeStamp()
-        );
-        if ($this->vavailability) {
-
-            $this->calculateAvailability($fbData, $this->vavailability);
-
-        }
-
-        $this->calculateBusy($fbData, $this->objects);
-
-        return $this->generateFreeBusyCalendar($fbData);
-
-
-    }
-
-    /**
-     * This method takes a VAVAILABILITY component and figures out all the
-     * available times.
-     *
-     * @param FreeBusyData $fbData
-     * @param VCalendar $vavailability
-     * @return void
-     */
-    protected function calculateAvailability(FreeBusyData $fbData, VCalendar $vavailability) {
-
-        $vavailComps = iterator_to_array($vavailability->VAVAILABILITY);
-        usort(
-            $vavailComps,
-            public function($a, $b) {
-
-                // We need to order the components by priority. Priority 1
-                // comes first, up until priority 9. Priority 0 comes after
-                // priority 9. No priority implies priority 0.
-                //
-                // Yes, I'm serious.
-                $priorityA = isset($a->PRIORITY) ? (int)$a->PRIORITY->getValue() : 0;
-                $priorityB = isset($b->PRIORITY) ? (int)$b->PRIORITY->getValue() : 0;
-
-                if ($priorityA === 0) $priorityA = 10;
-                if ($priorityB === 0) $priorityB = 10;
-
-                return $priorityA - $priorityB;
-
-            }
-        );
-
-        // Now we go over all the VAVAILABILITY components and figure if
-        // there's any we don't need to consider.
-        //
-        // This is can be because of one of two reasons: either the
-        // VAVAILABILITY component falls outside the time we are interested in,
-        // or a different VAVAILABILITY component with a higher priority has
-        // already completely covered the time-range.
-        $old = $vavailComps;
-        $new = [];
-
-        foreach ($old as $vavail) {
-
-            list($compStart, $compEnd) = $vavail->getEffectiveStartEnd();
-
-            // We don't care about datetimes that are earlier or later than the
-            // start and end of the freebusy report, so this gets normalized
-            // first.
-            if (is_null($compStart) || $compStart < $this->start) {
-                $compStart = $this->start;
-            }
-            if (is_null($compEnd) || $compEnd > $this->end) {
-                $compEnd = $this->end;
-            }
-
-            // If the item fell out of the timerange, we can just skip it.
-            if ($compStart > $this->end || $compEnd < $this->start) {
-                continue;
-            }
-
-            // Going through our existing list of components to see if there's
-            // a higher priority component that already fully covers this one.
-            foreach ($new as $higherVavail) {
-
-                list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
-                if (
-                    (is_null($higherStart) || $higherStart < $compStart) &&
-                    (is_null($higherEnd)   || $higherEnd > $compEnd)
-                ) {
-
-                    // Component is fully covered by a higher priority
-                    // component. We can skip this component.
-                    continue 2;
-
-                }
-
-            }
-
-            // We're keeping it!
-            $new[] = $vavail;
+	/**
+	 * Input objects.
+	 *
+	 * @var array
+	 */
+	protected $objects = [];
+
+	/**
+	 * Start of range.
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	protected $start;
+
+	/**
+	 * End of range.
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	protected $end;
+
+	/**
+	 * VCALENDAR object.
+	 *
+	 * @var Document
+	 */
+	protected $baseObject;
+
+	/**
+	 * Reference timezone.
+	 *
+	 * When we are calculating busy times, and we come across so-called
+	 * floating times (times without a timezone), we use the reference timezone
+	 * instead.
+	 *
+	 * This is also used for all-day events.
+	 *
+	 * This defaults to UTC.
+	 *
+	 * @var DateTimeZone
+	 */
+	protected $timeZone;
+
+	/**
+	 * A VAVAILABILITY document.
+	 *
+	 * If this is set, it's information will be included when calculating
+	 * freebusy time.
+	 *
+	 * @var Document
+	 */
+	protected $vavailability;
+
+	/**
+	 * Creates the generator.
+	 *
+	 * Check the setTimeRange and setObjects methods for details about the
+	 * arguments.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 * @param mixed $objects
+	 * @param DateTimeZone $timeZone
+	 */
+	public function __construct(DateTimeInterface $start = null, DateTimeInterface $end = null, $objects = null, DateTimeZone $timeZone = null) {
+
+		$this->setTimeRange($start, $end);
+
+		if ($objects) {
+			$this->setObjects($objects);
+		}
+		if (is_null($timeZone)) {
+			$timeZone = new DateTimeZone('UTC');
+		}
+		$this->setTimeZone($timeZone);
+
+	}
+
+	/**
+	 * Sets the VCALENDAR object.
+	 *
+	 * If this is set, it will not be generated for you. You are responsible
+	 * for setting things like the METHOD, CALSCALE, VERSION, etc..
+	 *
+	 * The VFREEBUSY object will be automatically added though.
+	 *
+	 * @param Document $vcalendar
+	 * @return void
+	 */
+	public function setBaseObject(Document $vcalendar) {
+
+		$this->baseObject = $vcalendar;
+
+	}
+
+	/**
+	 * Sets a VAVAILABILITY document.
+	 *
+	 * @param Document $vcalendar
+	 * @return void
+	 */
+	public function setVAvailability(Document $vcalendar) {
+
+		$this->vavailability = $vcalendar;
+
+	}
+
+	/**
+	 * Sets the input objects.
+	 *
+	 * You must either specify a valendar object as a string, or as the parse
+	 * Component.
+	 * It's also possible to specify multiple objects as an array.
+	 *
+	 * @param mixed $objects
+	 *
+	 * @return void
+	 */
+	public function setObjects($objects) {
+
+		if (!is_array($objects)) {
+			$objects = [$objects];
+		}
+
+		$this->objects = [];
+		foreach ($objects as $object) {
+
+			if (is_string($object)) {
+				$this->objects[] = Reader::read($object);
+			} elseif ($object instanceof Component) {
+				$this->objects[] = $object;
+			} else {
+				throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
+			}
+
+		}
+
+	}
+
+	/**
+	 * Sets the time range.
+	 *
+	 * Any freebusy object falling outside of this time range will be ignored.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 *
+	 * @return void
+	 */
+	public function setTimeRange(DateTimeInterface $start = null, DateTimeInterface $end = null) {
+
+		if (!$start) {
+			$start = new DateTimeImmutable(Settings::$minDate);
+		}
+		if (!$end) {
+			$end = new DateTimeImmutable(Settings::$maxDate);
+		}
+		$this->start = $start;
+		$this->end = $end;
+
+	}
+
+	/**
+	 * Sets the reference timezone for floating times.
+	 *
+	 * @param DateTimeZone $timeZone
+	 *
+	 * @return void
+	 */
+	public function setTimeZone(DateTimeZone $timeZone) {
+
+		$this->timeZone = $timeZone;
+
+	}
+
+	/**
+	 * Parses the input data and returns a correct VFREEBUSY object, wrapped in
+	 * a VCALENDAR.
+	 *
+	 * @return Component
+	 */
+	public function getResult() {
+
+		$fbData = new FreeBusyData(
+			$this->start->getTimeStamp(),
+			$this->end->getTimeStamp()
+		);
+		if ($this->vavailability) {
+
+			$this->calculateAvailability($fbData, $this->vavailability);
+
+		}
+
+		$this->calculateBusy($fbData, $this->objects);
+
+		return $this->generateFreeBusyCalendar($fbData);
+
+
+	}
+
+	/**
+	 * This method takes a VAVAILABILITY component and figures out all the
+	 * available times.
+	 *
+	 * @param FreeBusyData $fbData
+	 * @param VCalendar $vavailability
+	 * @return void
+	 */
+	protected function calculateAvailability(FreeBusyData $fbData, VCalendar $vavailability) {
+
+		$vavailComps = iterator_to_array($vavailability->VAVAILABILITY);
+		usort(
+			$vavailComps,
+			public function($a, $b) {
+
+				// We need to order the components by priority. Priority 1
+				// comes first, up until priority 9. Priority 0 comes after
+				// priority 9. No priority implies priority 0.
+				//
+				// Yes, I'm serious.
+				$priorityA = isset($a->PRIORITY) ? (int)$a->PRIORITY->getValue() : 0;
+				$priorityB = isset($b->PRIORITY) ? (int)$b->PRIORITY->getValue() : 0;
+
+				if ($priorityA === 0) $priorityA = 10;
+				if ($priorityB === 0) $priorityB = 10;
+
+				return $priorityA - $priorityB;
+
+			}
+		);
+
+		// Now we go over all the VAVAILABILITY components and figure if
+		// there's any we don't need to consider.
+		//
+		// This is can be because of one of two reasons: either the
+		// VAVAILABILITY component falls outside the time we are interested in,
+		// or a different VAVAILABILITY component with a higher priority has
+		// already completely covered the time-range.
+		$old = $vavailComps;
+		$new = [];
+
+		foreach ($old as $vavail) {
+
+			list($compStart, $compEnd) = $vavail->getEffectiveStartEnd();
+
+			// We don't care about datetimes that are earlier or later than the
+			// start and end of the freebusy report, so this gets normalized
+			// first.
+			if (is_null($compStart) || $compStart < $this->start) {
+				$compStart = $this->start;
+			}
+			if (is_null($compEnd) || $compEnd > $this->end) {
+				$compEnd = $this->end;
+			}
+
+			// If the item fell out of the timerange, we can just skip it.
+			if ($compStart > $this->end || $compEnd < $this->start) {
+				continue;
+			}
+
+			// Going through our existing list of components to see if there's
+			// a higher priority component that already fully covers this one.
+			foreach ($new as $higherVavail) {
+
+				list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
+				if (
+					(is_null($higherStart) || $higherStart < $compStart) &&
+					(is_null($higherEnd)   || $higherEnd > $compEnd)
+				) {
+
+					// Component is fully covered by a higher priority
+					// component. We can skip this component.
+					continue 2;
+
+				}
+
+			}
+
+			// We're keeping it!
+			$new[] = $vavail;
 
-        }
+		}
 
-        // Lastly, we need to traverse the remaining components and fill in the
-        // freebusydata slots.
-        //
-        // We traverse the components in reverse, because we want the higher
-        // priority components to override the lower ones.
-        foreach (array_reverse($new) as $vavail) {
-
-            $busyType = isset($vavail->BUSYTYPE) ? strtoupper($vavail->BUSYTYPE) : 'BUSY-UNAVAILABLE';
-            list($vavailStart, $vavailEnd) = $vavail->getEffectiveStartEnd();
-
-            // Making the component size no larger than the requested free-busy
-            // report range.
-            if (!$vavailStart || $vavailStart < $this->start) {
-                $vavailStart = $this->start;
-            }
-            if (!$vavailEnd || $vavailEnd > $this->end) {
-                $vavailEnd = $this->end;
-            }
-
-            // Marking the entire time range of the VAVAILABILITY component as
-            // busy.
-            $fbData->add(
-                $vavailStart->getTimeStamp(),
-                $vavailEnd->getTimeStamp(),
-                $busyType
-            );
-
-            // Looping over the AVAILABLE components.
-            if (isset($vavail->AVAILABLE)) foreach ($vavail->AVAILABLE as $available) {
-
-                list($availStart, $availEnd) = $available->getEffectiveStartEnd();
-                $fbData->add(
-                    $availStart->getTimeStamp(),
-                    $availEnd->getTimeStamp(),
-                    'FREE'
-                );
-
-                if ($available->RRULE) {
-                    // Our favourite thing: recurrence!!
-
-                    $rruleIterator = new Recur\RRuleIterator(
-                        $available->RRULE->getValue(),
-                        $availStart
-                    );
-                    $rruleIterator->fastForward($vavailStart);
-
-                    $startEndDiff = $availStart->diff($availEnd);
-
-                    while ($rruleIterator->valid()) {
-
-                        $recurStart = $rruleIterator->current();
-                        $recurEnd = $recurStart->add($startEndDiff);
-
-                        if ($recurStart > $vavailEnd) {
-                            // We're beyond the legal timerange.
-                            break;
-                        }
-
-                        if ($recurEnd > $vavailEnd) {
-                            // Truncating the end if it exceeds the
-                            // VAVAILABILITY end.
-                            $recurEnd = $vavailEnd;
-                        }
-
-                        $fbData->add(
-                            $recurStart->getTimeStamp(),
-                            $recurEnd->getTimeStamp(),
-                            'FREE'
-                        );
-
-                        $rruleIterator->next();
-
-                    }
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * This method takes an array of iCalendar objects and applies its busy
-     * times on fbData.
-     *
-     * @param FreeBusyData $fbData
-     * @param VCalendar[] $objects
-     */
-    protected function calculateBusy(FreeBusyData $fbData, array $objects) {
-
-        foreach ($objects as $key => $object) {
-
-            foreach ($object->getBaseComponents() as $component) {
-
-                switch ($component->name) {
-
-                    case 'VEVENT' :
-
-                        $FBTYPE = 'BUSY';
-                        if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
-                            break;
-                        }
-                        if (isset($component->STATUS)) {
-                            $status = strtoupper($component->STATUS);
-                            if ($status === 'CANCELLED') {
-                                break;
-                            }
-                            if ($status === 'TENTATIVE') {
-                                $FBTYPE = 'BUSY-TENTATIVE';
-                            }
-                        }
-
-                        $times = [];
-
-                        if ($component->RRULE) {
-                            try {
-                                $iterator = new EventIterator($object, (string)$component->UID, $this->timeZone);
-                            } catch (NoInstancesException $e) {
-                                // This event is recurring, but it doesn't have a single
-                                // instance. We are skipping this event from the output
-                                // entirely.
-                                unset($this->objects[$key]);
-                                continue;
-                            }
-
-                            if ($this->start) {
-                                $iterator->fastForward($this->start);
-                            }
+		// Lastly, we need to traverse the remaining components and fill in the
+		// freebusydata slots.
+		//
+		// We traverse the components in reverse, because we want the higher
+		// priority components to override the lower ones.
+		foreach (array_reverse($new) as $vavail) {
+
+			$busyType = isset($vavail->BUSYTYPE) ? strtoupper($vavail->BUSYTYPE) : 'BUSY-UNAVAILABLE';
+			list($vavailStart, $vavailEnd) = $vavail->getEffectiveStartEnd();
+
+			// Making the component size no larger than the requested free-busy
+			// report range.
+			if (!$vavailStart || $vavailStart < $this->start) {
+				$vavailStart = $this->start;
+			}
+			if (!$vavailEnd || $vavailEnd > $this->end) {
+				$vavailEnd = $this->end;
+			}
+
+			// Marking the entire time range of the VAVAILABILITY component as
+			// busy.
+			$fbData->add(
+				$vavailStart->getTimeStamp(),
+				$vavailEnd->getTimeStamp(),
+				$busyType
+			);
+
+			// Looping over the AVAILABLE components.
+			if (isset($vavail->AVAILABLE)) foreach ($vavail->AVAILABLE as $available) {
+
+				list($availStart, $availEnd) = $available->getEffectiveStartEnd();
+				$fbData->add(
+					$availStart->getTimeStamp(),
+					$availEnd->getTimeStamp(),
+					'FREE'
+				);
+
+				if ($available->RRULE) {
+					// Our favourite thing: recurrence!!
+
+					$rruleIterator = new Recur\RRuleIterator(
+						$available->RRULE->getValue(),
+						$availStart
+					);
+					$rruleIterator->fastForward($vavailStart);
+
+					$startEndDiff = $availStart->diff($availEnd);
+
+					while ($rruleIterator->valid()) {
+
+						$recurStart = $rruleIterator->current();
+						$recurEnd = $recurStart->add($startEndDiff);
+
+						if ($recurStart > $vavailEnd) {
+							// We're beyond the legal timerange.
+							break;
+						}
+
+						if ($recurEnd > $vavailEnd) {
+							// Truncating the end if it exceeds the
+							// VAVAILABILITY end.
+							$recurEnd = $vavailEnd;
+						}
+
+						$fbData->add(
+							$recurStart->getTimeStamp(),
+							$recurEnd->getTimeStamp(),
+							'FREE'
+						);
+
+						$rruleIterator->next();
+
+					}
+				}
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * This method takes an array of iCalendar objects and applies its busy
+	 * times on fbData.
+	 *
+	 * @param FreeBusyData $fbData
+	 * @param VCalendar[] $objects
+	 */
+	protected function calculateBusy(FreeBusyData $fbData, array $objects) {
+
+		foreach ($objects as $key => $object) {
+
+			foreach ($object->getBaseComponents() as $component) {
+
+				switch ($component->name) {
+
+					case 'VEVENT' :
+
+						$FBTYPE = 'BUSY';
+						if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
+							break;
+						}
+						if (isset($component->STATUS)) {
+							$status = strtoupper($component->STATUS);
+							if ($status === 'CANCELLED') {
+								break;
+							}
+							if ($status === 'TENTATIVE') {
+								$FBTYPE = 'BUSY-TENTATIVE';
+							}
+						}
+
+						$times = [];
+
+						if ($component->RRULE) {
+							try {
+								$iterator = new EventIterator($object, (string)$component->UID, $this->timeZone);
+							} catch (NoInstancesException $e) {
+								// This event is recurring, but it doesn't have a single
+								// instance. We are skipping this event from the output
+								// entirely.
+								unset($this->objects[$key]);
+								continue;
+							}
+
+							if ($this->start) {
+								$iterator->fastForward($this->start);
+							}
 
-                            $maxRecurrences = Settings::$maxRecurrences;
-
-                            while ($iterator->valid() && --$maxRecurrences) {
-
-                                $startTime = $iterator->getDTStart();
-                                if ($this->end && $startTime > $this->end) {
-                                    break;
-                                }
-                                $times[] = [
-                                    $iterator->getDTStart(),
-                                    $iterator->getDTEnd(),
-                                ];
-
-                                $iterator->next();
-
-                            }
+							$maxRecurrences = Settings::$maxRecurrences;
+
+							while ($iterator->valid() && --$maxRecurrences) {
+
+								$startTime = $iterator->getDTStart();
+								if ($this->end && $startTime > $this->end) {
+									break;
+								}
+								$times[] = [
+									$iterator->getDTStart(),
+									$iterator->getDTEnd(),
+								];
+
+								$iterator->next();
+
+							}
 
-                        } else {
-
-                            $startTime = $component->DTSTART->getDateTime($this->timeZone);
-                            if ($this->end && $startTime > $this->end) {
-                                break;
-                            }
-                            $endTime = null;
-                            if (isset($component->DTEND)) {
-                                $endTime = $component->DTEND->getDateTime($this->timeZone);
-                            } elseif (isset($component->DURATION)) {
-                                $duration = DateTimeParser::parseDuration((string)$component->DURATION);
-                                $endTime = clone $startTime;
-                                $endTime = $endTime->add($duration);
-                            } elseif (!$component->DTSTART->hasTime()) {
-                                $endTime = clone $startTime;
-                                $endTime = $endTime->modify('+1 day');
-                            } else {
-                                // The event had no duration (0 seconds)
-                                break;
-                            }
-
-                            $times[] = [$startTime, $endTime];
-
-                        }
-
-                        foreach ($times as $time) {
-
-                            if ($this->end && $time[0] > $this->end) break;
-                            if ($this->start && $time[1] < $this->start) break;
-
-                            $fbData->add(
-                                $time[0]->getTimeStamp(),
-                                $time[1]->getTimeStamp(),
-                                $FBTYPE
-                            );
-                        }
-                        break;
-
-                    case 'VFREEBUSY' :
-                        foreach ($component->FREEBUSY as $freebusy) {
-
-                            $fbType = isset($freebusy['FBTYPE']) ? strtoupper($freebusy['FBTYPE']) : 'BUSY';
-
-                            // Skipping intervals marked as 'free'
-                            if ($fbType === 'FREE')
-                                continue;
-
-                            $values = explode(',', $freebusy);
-                            foreach ($values as $value) {
-                                list($startTime, $endTime) = explode('/', $value);
-                                $startTime = DateTimeParser::parseDateTime($startTime);
-
-                                if (substr($endTime, 0, 1) === 'P' || substr($endTime, 0, 2) === '-P') {
-                                    $duration = DateTimeParser::parseDuration($endTime);
-                                    $endTime = clone $startTime;
-                                    $endTime = $endTime->add($duration);
-                                } else {
-                                    $endTime = DateTimeParser::parseDateTime($endTime);
-                                }
-
-                                if ($this->start && $this->start > $endTime) continue;
-                                if ($this->end && $this->end < $startTime) continue;
-                                $fbData->add(
-                                    $startTime->getTimeStamp(),
-                                    $endTime->getTimeStamp(),
-                                    $fbType
-                                );
-
-                            }
-
-
-                        }
-                        break;
-
-                }
+						} else {
+
+							$startTime = $component->DTSTART->getDateTime($this->timeZone);
+							if ($this->end && $startTime > $this->end) {
+								break;
+							}
+							$endTime = null;
+							if (isset($component->DTEND)) {
+								$endTime = $component->DTEND->getDateTime($this->timeZone);
+							} elseif (isset($component->DURATION)) {
+								$duration = DateTimeParser::parseDuration((string)$component->DURATION);
+								$endTime = clone $startTime;
+								$endTime = $endTime->add($duration);
+							} elseif (!$component->DTSTART->hasTime()) {
+								$endTime = clone $startTime;
+								$endTime = $endTime->modify('+1 day');
+							} else {
+								// The event had no duration (0 seconds)
+								break;
+							}
+
+							$times[] = [$startTime, $endTime];
+
+						}
+
+						foreach ($times as $time) {
+
+							if ($this->end && $time[0] > $this->end) break;
+							if ($this->start && $time[1] < $this->start) break;
+
+							$fbData->add(
+								$time[0]->getTimeStamp(),
+								$time[1]->getTimeStamp(),
+								$FBTYPE
+							);
+						}
+						break;
+
+					case 'VFREEBUSY' :
+						foreach ($component->FREEBUSY as $freebusy) {
+
+							$fbType = isset($freebusy['FBTYPE']) ? strtoupper($freebusy['FBTYPE']) : 'BUSY';
+
+							// Skipping intervals marked as 'free'
+							if ($fbType === 'FREE')
+								continue;
+
+							$values = explode(',', $freebusy);
+							foreach ($values as $value) {
+								list($startTime, $endTime) = explode('/', $value);
+								$startTime = DateTimeParser::parseDateTime($startTime);
+
+								if (substr($endTime, 0, 1) === 'P' || substr($endTime, 0, 2) === '-P') {
+									$duration = DateTimeParser::parseDuration($endTime);
+									$endTime = clone $startTime;
+									$endTime = $endTime->add($duration);
+								} else {
+									$endTime = DateTimeParser::parseDateTime($endTime);
+								}
+
+								if ($this->start && $this->start > $endTime) continue;
+								if ($this->end && $this->end < $startTime) continue;
+								$fbData->add(
+									$startTime->getTimeStamp(),
+									$endTime->getTimeStamp(),
+									$fbType
+								);
+
+							}
+
+
+						}
+						break;
+
+				}
 
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * This method takes a FreeBusyData object and generates the VCALENDAR
-     * object associated with it.
-     *
-     * @return VCalendar
-     */
-    protected function generateFreeBusyCalendar(FreeBusyData $fbData) {
-
-        if ($this->baseObject) {
-            $calendar = $this->baseObject;
-        } else {
-            $calendar = new VCalendar();
-        }
+	/**
+	 * This method takes a FreeBusyData object and generates the VCALENDAR
+	 * object associated with it.
+	 *
+	 * @return VCalendar
+	 */
+	protected function generateFreeBusyCalendar(FreeBusyData $fbData) {
+
+		if ($this->baseObject) {
+			$calendar = $this->baseObject;
+		} else {
+			$calendar = new VCalendar();
+		}
 
-        $vfreebusy = $calendar->createComponent('VFREEBUSY');
-        $calendar->add($vfreebusy);
+		$vfreebusy = $calendar->createComponent('VFREEBUSY');
+		$calendar->add($vfreebusy);
 
-        if ($this->start) {
-            $dtstart = $calendar->createProperty('DTSTART');
-            $dtstart->setDateTime($this->start);
-            $vfreebusy->add($dtstart);
-        }
-        if ($this->end) {
-            $dtend = $calendar->createProperty('DTEND');
-            $dtend->setDateTime($this->end);
-            $vfreebusy->add($dtend);
-        }
+		if ($this->start) {
+			$dtstart = $calendar->createProperty('DTSTART');
+			$dtstart->setDateTime($this->start);
+			$vfreebusy->add($dtstart);
+		}
+		if ($this->end) {
+			$dtend = $calendar->createProperty('DTEND');
+			$dtend->setDateTime($this->end);
+			$vfreebusy->add($dtend);
+		}
 
-        $tz = new \DateTimeZone('UTC');
-        $dtstamp = $calendar->createProperty('DTSTAMP');
-        $dtstamp->setDateTime(new DateTimeImmutable('now', $tz));
-        $vfreebusy->add($dtstamp);
+		$tz = new \DateTimeZone('UTC');
+		$dtstamp = $calendar->createProperty('DTSTAMP');
+		$dtstamp->setDateTime(new DateTimeImmutable('now', $tz));
+		$vfreebusy->add($dtstamp);
 
-        foreach ($fbData->getData() as $busyTime) {
+		foreach ($fbData->getData() as $busyTime) {
 
-            $busyType = strtoupper($busyTime['type']);
+			$busyType = strtoupper($busyTime['type']);
 
-            // Ignoring all the FREE parts, because those are already assumed.
-            if ($busyType === 'FREE') {
-                continue;
-            }
+			// Ignoring all the FREE parts, because those are already assumed.
+			if ($busyType === 'FREE') {
+				continue;
+			}
 
-            $busyTime[0] = new \DateTimeImmutable('@' . $busyTime['start'], $tz);
-            $busyTime[1] = new \DateTimeImmutable('@' . $busyTime['end'], $tz);
+			$busyTime[0] = new \DateTimeImmutable('@' . $busyTime['start'], $tz);
+			$busyTime[1] = new \DateTimeImmutable('@' . $busyTime['end'], $tz);
 
-            $prop = $calendar->createProperty(
-                'FREEBUSY',
-                $busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
-            );
+			$prop = $calendar->createProperty(
+				'FREEBUSY',
+				$busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
+			);
 
-            // Only setting FBTYPE if it's not BUSY, because BUSY is the
-            // default anyway.
-            if ($busyType !== 'BUSY') {
-                $prop['FBTYPE'] = $busyType;
-            }
-            $vfreebusy->add($prop);
+			// Only setting FBTYPE if it's not BUSY, because BUSY is the
+			// default anyway.
+			if ($busyType !== 'BUSY') {
+				$prop['FBTYPE'] = $busyType;
+			}
+			$vfreebusy->add($prop);
 
-        }
+		}
 
-        return $calendar;
+		return $calendar;
 
 
-    }
+	}
 
 }

libraries/SabreDAV/VObject/Property/ICalendar/Period.php

Indentation +132 added lines, -132 removed lines

@@ -19,137 +19,137 @@
  */
 class Period extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = ',';
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue(explode($this->delimiter, $val));
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode($this->delimiter, $this->getParts());
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'PERIOD';
-
-    }
-
-    /**
-     * Sets the json value, as it would appear in a jCard or jCal object.
-     *
-     * The value must always be an array.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setJsonValue(array $value) {
-
-        $value = array_map(
-            public function($item) {
-
-                return strtr(implode('/', $item), [':' => '', '-' => '']);
-
-            },
-            $value
-        );
-        parent::setJsonValue($value);
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $return = [];
-        foreach ($this->getParts() as $item) {
-
-            list($start, $end) = explode('/', $item, 2);
-
-            $start = DateTimeParser::parseDateTime($start);
-
-            // This is a duration value.
-            if ($end[0] === 'P') {
-                $return[] = [
-                    $start->format('Y-m-d\\TH:i:s'),
-                    $end
-                ];
-            } else {
-                $end = DateTimeParser::parseDateTime($end);
-                $return[] = [
-                    $start->format('Y-m-d\\TH:i:s'),
-                    $end->format('Y-m-d\\TH:i:s'),
-                ];
-            }
-
-        }
-
-        return $return;
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        $writer->startElement(strtolower($this->getValueType()));
-        $value = $this->getJsonValue();
-        $writer->writeElement('start', $value[0][0]);
-
-        if ($value[0][1][0] === 'P') {
-            $writer->writeElement('duration', $value[0][1]);
-        }
-        else {
-            $writer->writeElement('end', $value[0][1]);
-        }
-
-        $writer->endElement();
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = ',';
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue(explode($this->delimiter, $val));
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return implode($this->delimiter, $this->getParts());
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'PERIOD';
+
+	}
+
+	/**
+	 * Sets the json value, as it would appear in a jCard or jCal object.
+	 *
+	 * The value must always be an array.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setJsonValue(array $value) {
+
+		$value = array_map(
+			public function($item) {
+
+				return strtr(implode('/', $item), [':' => '', '-' => '']);
+
+			},
+			$value
+		);
+		parent::setJsonValue($value);
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		$return = [];
+		foreach ($this->getParts() as $item) {
+
+			list($start, $end) = explode('/', $item, 2);
+
+			$start = DateTimeParser::parseDateTime($start);
+
+			// This is a duration value.
+			if ($end[0] === 'P') {
+				$return[] = [
+					$start->format('Y-m-d\\TH:i:s'),
+					$end
+				];
+			} else {
+				$end = DateTimeParser::parseDateTime($end);
+				$return[] = [
+					$start->format('Y-m-d\\TH:i:s'),
+					$end->format('Y-m-d\\TH:i:s'),
+				];
+			}
+
+		}
+
+		return $return;
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		$writer->startElement(strtolower($this->getValueType()));
+		$value = $this->getJsonValue();
+		$writer->writeElement('start', $value[0][0]);
+
+		if ($value[0][1][0] === 'P') {
+			$writer->writeElement('duration', $value[0][1]);
+		}
+		else {
+			$writer->writeElement('end', $value[0][1]);
+		}
+
+		$writer->endElement();
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/ICalendar/CalAddress.php

Indentation +43 added lines, -43 removed lines

@@ -3,7 +3,7 @@ 
 namespace Sabre\VObject\Property\ICalendar;
 
 use
-    Sabre\VObject\Property\Text;
+	Sabre\VObject\Property\Text;
 
 /**
  * CalAddress property.
@@ -16,46 +16,46 @@ 
  */
 class CalAddress extends Text {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = null;
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'CAL-ADDRESS';
-
-    }
-
-    /**
-     * This returns a normalized form of the value.
-     *
-     * This is primarily used right now to turn mixed-cased schemes in user
-     * uris to lower-case.
-     *
-     * Evolution in particular tends to encode mailto: as MAILTO:.
-     *
-     * @return string
-     */
-    public function getNormalizedValue() {
-
-        $input = $this->getValue();
-        if (!strpos($input, ':')) {
-            return $input;
-        }
-        list($schema, $everythingElse) = explode(':', $input, 2);
-        return strtolower($schema) . ':' . $everythingElse;
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = null;
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'CAL-ADDRESS';
+
+	}
+
+	/**
+	 * This returns a normalized form of the value.
+	 *
+	 * This is primarily used right now to turn mixed-cased schemes in user
+	 * uris to lower-case.
+	 *
+	 * Evolution in particular tends to encode mailto: as MAILTO:.
+	 *
+	 * @return string
+	 */
+	public function getNormalizedValue() {
+
+		$input = $this->getValue();
+		if (!strpos($input, ':')) {
+			return $input;
+		}
+		list($schema, $everythingElse) = explode(':', $input, 2);
+		return strtolower($schema) . ':' . $everythingElse;
+
+	}
 }

libraries/SabreDAV/VObject/Property/ICalendar/Recur.php

Indentation +265 added lines, -265 removed lines

@@ -24,270 +24,270 @@
  */
 class Recur extends Property {
 
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * @param string|array $value
-     *
-     * @return void
-     */
-    public function setValue($value) {
-
-        // If we're getting the data from json, we'll be receiving an object
-        if ($value instanceof \StdClass) {
-            $value = (array)$value;
-        }
-
-        if (is_array($value)) {
-            $newVal = [];
-            foreach ($value as $k => $v) {
-
-                if (is_string($v)) {
-                    $v = strtoupper($v);
-
-                    // The value had multiple sub-values
-                    if (strpos($v, ',') !== false) {
-                        $v = explode(',', $v);
-                    }
-                    if (strcmp($k, 'until') === 0) {
-                        $v = strtr($v, [':' => '', '-' => '']);
-                    }
-                } elseif (is_array($v)) {
-                    $v = array_map('strtoupper', $v);
-                }
-
-                $newVal[strtoupper($k)] = $v;
-            }
-            $this->value = $newVal;
-        } elseif (is_string($value)) {
-            $this->value = self::stringToArray($value);
-        } else {
-            throw new \InvalidArgumentException('You must either pass a string, or a key=>value array');
-        }
-
-    }
-
-    /**
-     * Returns the current value.
-     *
-     * This method will always return a singular value. If this was a
-     * multi-value object, some decision will be made first on how to represent
-     * it as a string.
-     *
-     * To get the correct multi-value version, use getParts.
-     *
-     * @return string
-     */
-    public function getValue() {
-
-        $out = [];
-        foreach ($this->value as $key => $value) {
-            $out[] = $key . '=' . (is_array($value) ? implode(',', $value) : $value);
-        }
-        return strtoupper(implode(';', $out));
-
-    }
-
-    /**
-     * Sets a multi-valued property.
-     *
-     * @param array $parts
-     * @return void
-     */
-    public function setParts(array $parts) {
-
-        $this->setValue($parts);
-
-    }
-
-    /**
-     * Returns a multi-valued property.
-     *
-     * This method always returns an array, if there was only a single value,
-     * it will still be wrapped in an array.
-     *
-     * @return array
-     */
-    public function getParts() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue($val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return $this->getValue();
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'RECUR';
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $values = [];
-        foreach ($this->getParts() as $k => $v) {
-            if (strcmp($k, 'UNTIL') === 0) {
-                $date = new DateTime($this->root, null, $v);
-                $values[strtolower($k)] = $date->getJsonValue()[0];
-            } elseif (strcmp($k, 'COUNT') === 0) {
-                $values[strtolower($k)] = intval($v);
-            } else {
-                $values[strtolower($k)] = $v;
-            }
-        }
-        return [$values];
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        $valueType = strtolower($this->getValueType());
-
-        foreach ($this->getJsonValue() as $value) {
-            $writer->writeElement($valueType, $value);
-        }
-
-    }
-
-    /**
-     * Parses an RRULE value string, and turns it into a struct-ish array.
-     *
-     * @param string $value
-     *
-     * @return array
-     */
-    static function stringToArray($value) {
-
-        $value = strtoupper($value);
-        $newValue = [];
-        foreach (explode(';', $value) as $part) {
-
-            // Skipping empty parts.
-            if (empty($part)) {
-                continue;
-            }
-            list($partName, $partValue) = explode('=', $part);
-
-            // The value itself had multiple values..
-            if (strpos($partValue, ',') !== false) {
-                $partValue = explode(',', $partValue);
-            }
-            $newValue[$partName] = $partValue;
-
-        }
-
-        return $newValue;
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   Node::REPAIR - May attempt to automatically repair the problem.
-     *
-     * This method returns an array with detected problems.
-     * Every element has the following properties:
-     *
-     *  * level - problem level.
-     *  * message - A human-readable string describing the issue.
-     *  * node - A reference to the problematic node.
-     *
-     * The level means:
-     *   1 - The issue was repaired (only happens if REPAIR was turned on)
-     *   2 - An inconsequential issue
-     *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $repair = ($options & self::REPAIR);
-
-        $warnings = parent::validate($options);
-        $values = $this->getParts();
-
-        foreach ($values as $key => $value) {
-
-            if (empty($value)) {
-                $warnings[] = [
-                    'level'   => $repair ? 3 : 1,
-                    'message' => 'Invalid value for ' . $key . ' in ' . $this->name,
-                    'node'    => $this
-                ];
-                if ($repair) {
-                    unset($values[$key]);
-                }
-            }
-
-        }
-        if (!isset($values['FREQ'])) {
-            $warnings[] = [
-                'level'   => $repair ? 3 : 1,
-                'message' => 'FREQ is required in ' . $this->name,
-                'node'    => $this
-            ];
-            if ($repair) {
-                $this->parent->remove($this);
-            }
-        }
-        if ($repair) {
-            $this->setValue($values);
-        }
-
-        return $warnings;
-
-    }
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * @param string|array $value
+	 *
+	 * @return void
+	 */
+	public function setValue($value) {
+
+		// If we're getting the data from json, we'll be receiving an object
+		if ($value instanceof \StdClass) {
+			$value = (array)$value;
+		}
+
+		if (is_array($value)) {
+			$newVal = [];
+			foreach ($value as $k => $v) {
+
+				if (is_string($v)) {
+					$v = strtoupper($v);
+
+					// The value had multiple sub-values
+					if (strpos($v, ',') !== false) {
+						$v = explode(',', $v);
+					}
+					if (strcmp($k, 'until') === 0) {
+						$v = strtr($v, [':' => '', '-' => '']);
+					}
+				} elseif (is_array($v)) {
+					$v = array_map('strtoupper', $v);
+				}
+
+				$newVal[strtoupper($k)] = $v;
+			}
+			$this->value = $newVal;
+		} elseif (is_string($value)) {
+			$this->value = self::stringToArray($value);
+		} else {
+			throw new \InvalidArgumentException('You must either pass a string, or a key=>value array');
+		}
+
+	}
+
+	/**
+	 * Returns the current value.
+	 *
+	 * This method will always return a singular value. If this was a
+	 * multi-value object, some decision will be made first on how to represent
+	 * it as a string.
+	 *
+	 * To get the correct multi-value version, use getParts.
+	 *
+	 * @return string
+	 */
+	public function getValue() {
+
+		$out = [];
+		foreach ($this->value as $key => $value) {
+			$out[] = $key . '=' . (is_array($value) ? implode(',', $value) : $value);
+		}
+		return strtoupper(implode(';', $out));
+
+	}
+
+	/**
+	 * Sets a multi-valued property.
+	 *
+	 * @param array $parts
+	 * @return void
+	 */
+	public function setParts(array $parts) {
+
+		$this->setValue($parts);
+
+	}
+
+	/**
+	 * Returns a multi-valued property.
+	 *
+	 * This method always returns an array, if there was only a single value,
+	 * it will still be wrapped in an array.
+	 *
+	 * @return array
+	 */
+	public function getParts() {
+
+		return $this->value;
+
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue($val);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return $this->getValue();
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'RECUR';
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		$values = [];
+		foreach ($this->getParts() as $k => $v) {
+			if (strcmp($k, 'UNTIL') === 0) {
+				$date = new DateTime($this->root, null, $v);
+				$values[strtolower($k)] = $date->getJsonValue()[0];
+			} elseif (strcmp($k, 'COUNT') === 0) {
+				$values[strtolower($k)] = intval($v);
+			} else {
+				$values[strtolower($k)] = $v;
+			}
+		}
+		return [$values];
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		$valueType = strtolower($this->getValueType());
+
+		foreach ($this->getJsonValue() as $value) {
+			$writer->writeElement($valueType, $value);
+		}
+
+	}
+
+	/**
+	 * Parses an RRULE value string, and turns it into a struct-ish array.
+	 *
+	 * @param string $value
+	 *
+	 * @return array
+	 */
+	static function stringToArray($value) {
+
+		$value = strtoupper($value);
+		$newValue = [];
+		foreach (explode(';', $value) as $part) {
+
+			// Skipping empty parts.
+			if (empty($part)) {
+				continue;
+			}
+			list($partName, $partValue) = explode('=', $part);
+
+			// The value itself had multiple values..
+			if (strpos($partValue, ',') !== false) {
+				$partValue = explode(',', $partValue);
+			}
+			$newValue[$partName] = $partValue;
+
+		}
+
+		return $newValue;
+	}
+
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   Node::REPAIR - May attempt to automatically repair the problem.
+	 *
+	 * This method returns an array with detected problems.
+	 * Every element has the following properties:
+	 *
+	 *  * level - problem level.
+	 *  * message - A human-readable string describing the issue.
+	 *  * node - A reference to the problematic node.
+	 *
+	 * The level means:
+	 *   1 - The issue was repaired (only happens if REPAIR was turned on)
+	 *   2 - An inconsequential issue
+	 *   3 - A severe issue.
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0) {
+
+		$repair = ($options & self::REPAIR);
+
+		$warnings = parent::validate($options);
+		$values = $this->getParts();
+
+		foreach ($values as $key => $value) {
+
+			if (empty($value)) {
+				$warnings[] = [
+					'level'   => $repair ? 3 : 1,
+					'message' => 'Invalid value for ' . $key . ' in ' . $this->name,
+					'node'    => $this
+				];
+				if ($repair) {
+					unset($values[$key]);
+				}
+			}
+
+		}
+		if (!isset($values['FREQ'])) {
+			$warnings[] = [
+				'level'   => $repair ? 3 : 1,
+				'message' => 'FREQ is required in ' . $this->name,
+				'node'    => $this
+			];
+			if ($repair) {
+				$this->parent->remove($this);
+			}
+		}
+		if ($repair) {
+			$this->setValue($values);
+		}
+
+		return $warnings;
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/ICalendar/Duration.php

Indentation +63 added lines, -63 removed lines

@@ -18,68 +18,68 @@
  */
 class Duration extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = ',';
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue(explode($this->delimiter, $val));
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode($this->delimiter, $this->getParts());
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'DURATION';
-
-    }
-
-    /**
-     * Returns a DateInterval representation of the Duration property.
-     *
-     * If the property has more than one value, only the first is returned.
-     *
-     * @return \DateInterval
-     */
-    public function getDateInterval() {
-
-        $parts = $this->getParts();
-        $value = $parts[0];
-        return DateTimeParser::parseDuration($value);
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = ',';
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue(explode($this->delimiter, $val));
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return implode($this->delimiter, $this->getParts());
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'DURATION';
+
+	}
+
+	/**
+	 * Returns a DateInterval representation of the Duration property.
+	 *
+	 * If the property has more than one value, only the first is returned.
+	 *
+	 * @return \DateInterval
+	 */
+	public function getDateInterval() {
+
+		$parts = $this->getParts();
+		$value = $parts[0];
+		return DateTimeParser::parseDuration($value);
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/ICalendar/DateTime.php

Indentation +375 added lines, -375 removed lines

@@ -26,379 +26,379 @@
  */
 class DateTime extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = ',';
-
-    /**
-     * Sets a multi-valued property.
-     *
-     * You may also specify DateTime objects here.
-     *
-     * @param array $parts
-     *
-     * @return void
-     */
-    public function setParts(array $parts) {
-
-        if (isset($parts[0]) && $parts[0] instanceof DateTimeInterface) {
-            $this->setDateTimes($parts);
-        } else {
-            parent::setParts($parts);
-        }
-
-    }
-
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * Instead of strings, you may also use DateTime here.
-     *
-     * @param string|array|DateTimeInterface $value
-     *
-     * @return void
-     */
-    public function setValue($value) {
-
-        if (is_array($value) && isset($value[0]) && $value[0] instanceof DateTimeInterface) {
-            $this->setDateTimes($value);
-        } elseif ($value instanceof DateTimeInterface) {
-            $this->setDateTimes([$value]);
-        } else {
-            parent::setValue($value);
-        }
-
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue(explode($this->delimiter, $val));
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode($this->delimiter, $this->getParts());
-
-    }
-
-    /**
-     * Returns true if this is a DATE-TIME value, false if it's a DATE.
-     *
-     * @return bool
-     */
-    public function hasTime() {
-
-        return strtoupper((string)$this['VALUE']) !== 'DATE';
-
-    }
-
-    /**
-     * Returns true if this is a floating DATE or DATE-TIME.
-     *
-     * Note that DATE is always floating.
-     */
-    public function isFloating() {
-
-        return
-            !$this->hasTime() ||
-            (
-                !isset($this['TZID']) &&
-                strpos($this->getValue(), 'Z') === false
-            );
-
-    }
-
-    /**
-     * Returns a date-time value.
-     *
-     * Note that if this property contained more than 1 date-time, only the
-     * first will be returned. To get an array with multiple values, call
-     * getDateTimes.
-     *
-     * If no timezone information is known, because it's either an all-day
-     * property or floating time, we will use the DateTimeZone argument to
-     * figure out the exact date.
-     *
-     * @param DateTimeZone $timeZone
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDateTime(DateTimeZone $timeZone = null) {
-
-        $dt = $this->getDateTimes($timeZone);
-        if (!$dt) return;
-
-        return $dt[0];
-
-    }
-
-    /**
-     * Returns multiple date-time values.
-     *
-     * If no timezone information is known, because it's either an all-day
-     * property or floating time, we will use the DateTimeZone argument to
-     * figure out the exact date.
-     *
-     * @param DateTimeZone $timeZone
-     *
-     * @return DateTimeImmutable[]
-     * @return \DateTime[]
-     */
-    public function getDateTimes(DateTimeZone $timeZone = null) {
-
-        // Does the property have a TZID?
-        $tzid = $this['TZID'];
-
-        if ($tzid) {
-            $timeZone = TimeZoneUtil::getTimeZone((string)$tzid, $this->root);
-        }
-
-        $dts = [];
-        foreach ($this->getParts() as $part) {
-            $dts[] = DateTimeParser::parse($part, $timeZone);
-        }
-        return $dts;
-
-    }
-
-    /**
-     * Sets the property as a DateTime object.
-     *
-     * @param DateTimeInterface $dt
-     * @param bool isFloating If set to true, timezones will be ignored.
-     *
-     * @return void
-     */
-    public function setDateTime(DateTimeInterface $dt, $isFloating = false) {
-
-        $this->setDateTimes([$dt], $isFloating);
-
-    }
-
-    /**
-     * Sets the property as multiple date-time objects.
-     *
-     * The first value will be used as a reference for the timezones, and all
-     * the otehr values will be adjusted for that timezone
-     *
-     * @param DateTimeInterface[] $dt
-     * @param bool isFloating If set to true, timezones will be ignored.
-     *
-     * @return void
-     */
-    public function setDateTimes(array $dt, $isFloating = false) {
-
-        $values = [];
-
-        if ($this->hasTime()) {
-
-            $tz = null;
-            $isUtc = false;
-
-            foreach ($dt as $d) {
-
-                if ($isFloating) {
-                    $values[] = $d->format('Ymd\\THis');
-                    continue;
-                }
-                if (is_null($tz)) {
-                    $tz = $d->getTimeZone();
-                    $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z', '+00:00']);
-                    if (!$isUtc) {
-                        $this->offsetSet('TZID', $tz->getName());
-                    }
-                } else {
-                    $d = $d->setTimeZone($tz);
-                }
-
-                if ($isUtc) {
-                    $values[] = $d->format('Ymd\\THis\\Z');
-                } else {
-                    $values[] = $d->format('Ymd\\THis');
-                }
-
-            }
-            if ($isUtc || $isFloating) {
-                $this->offsetUnset('TZID');
-            }
-
-        } else {
-
-            foreach ($dt as $d) {
-
-                $values[] = $d->format('Ymd');
-
-            }
-            $this->offsetUnset('TZID');
-
-        }
-
-        $this->value = $values;
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return $this->hasTime() ? 'DATE-TIME' : 'DATE';
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for JSON.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $dts = $this->getDateTimes();
-        $hasTime = $this->hasTime();
-        $isFloating = $this->isFloating();
-
-        $tz = $dts[0]->getTimeZone();
-        $isUtc = $isFloating ? false : in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
-
-        return array_map(
-            public function(DateTimeInterface $dt) use ($hasTime, $isUtc) {
-
-                if ($hasTime) {
-                    return $dt->format('Y-m-d\\TH:i:s') . ($isUtc ? 'Z' : '');
-                } else {
-                    return $dt->format('Y-m-d');
-                }
-
-            },
-            $dts
-        );
-
-    }
-
-    /**
-     * Sets the json value, as it would appear in a jCard or jCal object.
-     *
-     * The value must always be an array.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setJsonValue(array $value) {
-
-        // dates and times in jCal have one difference to dates and times in
-        // iCalendar. In jCal date-parts are separated by dashes, and
-        // time-parts are separated by colons. It makes sense to just remove
-        // those.
-        $this->setValue(
-            array_map(
-                public function($item) {
-
-                    return strtr($item, [':' => '', '-' => '']);
-
-                },
-                $value
-            )
-        );
-
-    }
-
-    /**
-     * We need to intercept offsetSet, because it may be used to alter the
-     * VALUE from DATE-TIME to DATE or vice-versa.
-     *
-     * @param string $name
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function offsetSet($name, $value) {
-
-        parent::offsetSet($name, $value);
-        if (strtoupper($name) !== 'VALUE') {
-            return;
-        }
-
-        // This will ensure that dates are correctly encoded.
-        $this->setDateTimes($this->getDateTimes());
-
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   Node::REPAIR - May attempt to automatically repair the problem.
-     *
-     * This method returns an array with detected problems.
-     * Every element has the following properties:
-     *
-     *  * level - problem level.
-     *  * message - A human-readable string describing the issue.
-     *  * node - A reference to the problematic node.
-     *
-     * The level means:
-     *   1 - The issue was repaired (only happens if REPAIR was turned on)
-     *   2 - An inconsequential issue
-     *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $messages = parent::validate($options);
-        $valueType = $this->getValueType();
-        $values = $this->getParts();
-        try {
-            foreach ($values as $value) {
-                switch ($valueType) {
-                    case 'DATE' :
-                        DateTimeParser::parseDate($value);
-                        break;
-                    case 'DATE-TIME' :
-                        DateTimeParser::parseDateTime($value);
-                        break;
-                }
-            }
-        } catch (InvalidDataException $e) {
-            $messages[] = [
-                'level'   => 3,
-                'message' => 'The supplied value (' . $value . ') is not a correct ' . $valueType,
-                'node'    => $this,
-            ];
-        }
-        return $messages;
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = ',';
+
+	/**
+	 * Sets a multi-valued property.
+	 *
+	 * You may also specify DateTime objects here.
+	 *
+	 * @param array $parts
+	 *
+	 * @return void
+	 */
+	public function setParts(array $parts) {
+
+		if (isset($parts[0]) && $parts[0] instanceof DateTimeInterface) {
+			$this->setDateTimes($parts);
+		} else {
+			parent::setParts($parts);
+		}
+
+	}
+
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * Instead of strings, you may also use DateTime here.
+	 *
+	 * @param string|array|DateTimeInterface $value
+	 *
+	 * @return void
+	 */
+	public function setValue($value) {
+
+		if (is_array($value) && isset($value[0]) && $value[0] instanceof DateTimeInterface) {
+			$this->setDateTimes($value);
+		} elseif ($value instanceof DateTimeInterface) {
+			$this->setDateTimes([$value]);
+		} else {
+			parent::setValue($value);
+		}
+
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue(explode($this->delimiter, $val));
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return implode($this->delimiter, $this->getParts());
+
+	}
+
+	/**
+	 * Returns true if this is a DATE-TIME value, false if it's a DATE.
+	 *
+	 * @return bool
+	 */
+	public function hasTime() {
+
+		return strtoupper((string)$this['VALUE']) !== 'DATE';
+
+	}
+
+	/**
+	 * Returns true if this is a floating DATE or DATE-TIME.
+	 *
+	 * Note that DATE is always floating.
+	 */
+	public function isFloating() {
+
+		return
+			!$this->hasTime() ||
+			(
+				!isset($this['TZID']) &&
+				strpos($this->getValue(), 'Z') === false
+			);
+
+	}
+
+	/**
+	 * Returns a date-time value.
+	 *
+	 * Note that if this property contained more than 1 date-time, only the
+	 * first will be returned. To get an array with multiple values, call
+	 * getDateTimes.
+	 *
+	 * If no timezone information is known, because it's either an all-day
+	 * property or floating time, we will use the DateTimeZone argument to
+	 * figure out the exact date.
+	 *
+	 * @param DateTimeZone $timeZone
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDateTime(DateTimeZone $timeZone = null) {
+
+		$dt = $this->getDateTimes($timeZone);
+		if (!$dt) return;
+
+		return $dt[0];
+
+	}
+
+	/**
+	 * Returns multiple date-time values.
+	 *
+	 * If no timezone information is known, because it's either an all-day
+	 * property or floating time, we will use the DateTimeZone argument to
+	 * figure out the exact date.
+	 *
+	 * @param DateTimeZone $timeZone
+	 *
+	 * @return DateTimeImmutable[]
+	 * @return \DateTime[]
+	 */
+	public function getDateTimes(DateTimeZone $timeZone = null) {
+
+		// Does the property have a TZID?
+		$tzid = $this['TZID'];
+
+		if ($tzid) {
+			$timeZone = TimeZoneUtil::getTimeZone((string)$tzid, $this->root);
+		}
+
+		$dts = [];
+		foreach ($this->getParts() as $part) {
+			$dts[] = DateTimeParser::parse($part, $timeZone);
+		}
+		return $dts;
+
+	}
+
+	/**
+	 * Sets the property as a DateTime object.
+	 *
+	 * @param DateTimeInterface $dt
+	 * @param bool isFloating If set to true, timezones will be ignored.
+	 *
+	 * @return void
+	 */
+	public function setDateTime(DateTimeInterface $dt, $isFloating = false) {
+
+		$this->setDateTimes([$dt], $isFloating);
+
+	}
+
+	/**
+	 * Sets the property as multiple date-time objects.
+	 *
+	 * The first value will be used as a reference for the timezones, and all
+	 * the otehr values will be adjusted for that timezone
+	 *
+	 * @param DateTimeInterface[] $dt
+	 * @param bool isFloating If set to true, timezones will be ignored.
+	 *
+	 * @return void
+	 */
+	public function setDateTimes(array $dt, $isFloating = false) {
+
+		$values = [];
+
+		if ($this->hasTime()) {
+
+			$tz = null;
+			$isUtc = false;
+
+			foreach ($dt as $d) {
+
+				if ($isFloating) {
+					$values[] = $d->format('Ymd\\THis');
+					continue;
+				}
+				if (is_null($tz)) {
+					$tz = $d->getTimeZone();
+					$isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z', '+00:00']);
+					if (!$isUtc) {
+						$this->offsetSet('TZID', $tz->getName());
+					}
+				} else {
+					$d = $d->setTimeZone($tz);
+				}
+
+				if ($isUtc) {
+					$values[] = $d->format('Ymd\\THis\\Z');
+				} else {
+					$values[] = $d->format('Ymd\\THis');
+				}
+
+			}
+			if ($isUtc || $isFloating) {
+				$this->offsetUnset('TZID');
+			}
+
+		} else {
+
+			foreach ($dt as $d) {
+
+				$values[] = $d->format('Ymd');
+
+			}
+			$this->offsetUnset('TZID');
+
+		}
+
+		$this->value = $values;
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return $this->hasTime() ? 'DATE-TIME' : 'DATE';
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for JSON.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		$dts = $this->getDateTimes();
+		$hasTime = $this->hasTime();
+		$isFloating = $this->isFloating();
+
+		$tz = $dts[0]->getTimeZone();
+		$isUtc = $isFloating ? false : in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
+
+		return array_map(
+			public function(DateTimeInterface $dt) use ($hasTime, $isUtc) {
+
+				if ($hasTime) {
+					return $dt->format('Y-m-d\\TH:i:s') . ($isUtc ? 'Z' : '');
+				} else {
+					return $dt->format('Y-m-d');
+				}
+
+			},
+			$dts
+		);
+
+	}
+
+	/**
+	 * Sets the json value, as it would appear in a jCard or jCal object.
+	 *
+	 * The value must always be an array.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setJsonValue(array $value) {
+
+		// dates and times in jCal have one difference to dates and times in
+		// iCalendar. In jCal date-parts are separated by dashes, and
+		// time-parts are separated by colons. It makes sense to just remove
+		// those.
+		$this->setValue(
+			array_map(
+				public function($item) {
+
+					return strtr($item, [':' => '', '-' => '']);
+
+				},
+				$value
+			)
+		);
+
+	}
+
+	/**
+	 * We need to intercept offsetSet, because it may be used to alter the
+	 * VALUE from DATE-TIME to DATE or vice-versa.
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 *
+	 * @return void
+	 */
+	public function offsetSet($name, $value) {
+
+		parent::offsetSet($name, $value);
+		if (strtoupper($name) !== 'VALUE') {
+			return;
+		}
+
+		// This will ensure that dates are correctly encoded.
+		$this->setDateTimes($this->getDateTimes());
+
+	}
+
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   Node::REPAIR - May attempt to automatically repair the problem.
+	 *
+	 * This method returns an array with detected problems.
+	 * Every element has the following properties:
+	 *
+	 *  * level - problem level.
+	 *  * message - A human-readable string describing the issue.
+	 *  * node - A reference to the problematic node.
+	 *
+	 * The level means:
+	 *   1 - The issue was repaired (only happens if REPAIR was turned on)
+	 *   2 - An inconsequential issue
+	 *   3 - A severe issue.
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0) {
+
+		$messages = parent::validate($options);
+		$valueType = $this->getValueType();
+		$values = $this->getParts();
+		try {
+			foreach ($values as $value) {
+				switch ($valueType) {
+					case 'DATE' :
+						DateTimeParser::parseDate($value);
+						break;
+					case 'DATE-TIME' :
+						DateTimeParser::parseDateTime($value);
+						break;
+				}
+			}
+		} catch (InvalidDataException $e) {
+			$messages[] = [
+				'level'   => 3,
+				'message' => 'The supplied value (' . $value . ') is not a correct ' . $valueType,
+				'node'    => $this,
+			];
+		}
+		return $messages;
+
+	}
 }

libraries/SabreDAV/VObject/Property/Unknown.php

Indentation +26 added lines, -26 removed lines

@@ -14,31 +14,31 @@
  */
 class Unknown extends Text {
 
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        return [$this->getRawMimeDirValue()];
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'UNKNOWN';
-
-    }
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		return [$this->getRawMimeDirValue()];
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'UNKNOWN';
+
+	}
 
 }