YetiForceCompany / YetiForceCRM

libraries/SabreDAV/VObject/Component/VCalendar.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -6,10 +6,10 @@
 use DateTimeZone;
 use Sabre\VObject;
 use Sabre\VObject\Component;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property;
 use Sabre\VObject\Recur\EventIterator;
 use Sabre\VObject\Recur\NoInstancesException;
-use Sabre\VObject\InvalidDataException;
 
 /**
  * The VCalendar component.

Spacing +3 added lines, -3 removed lines

@@ -331,7 +331,7 @@ 
                 // converting everything to UTC.
                 if ($child->name === 'VEVENT' && (isset($child->{'RECURRENCE-ID'}) || isset($child->RRULE) || isset($child->RDATE))) {
                     // Handle these a bit later.
-                    $uid = (string)$child->UID;
+                    $uid = (string) $child->UID;
                     if (!$uid) {
                         throw new InvalidDataException('Every VEVENT object must have a UID property');
                     }
@@ -449,7 +449,7 @@ 
         $warnings = parent::validate($options);
 
         if ($ver = $this->VERSION) {
-            if ((string)$ver !== '2.0') {
+            if ((string) $ver !== '2.0') {
                 $warnings[] = [
                     'level'   => 3,
                     'message' => 'Only iCalendar version 2.0 as defined in rfc5545 is supported.',
@@ -472,7 +472,7 @@ 
                 }
                 $componentTypes[] = $child->name;
 
-                $uid = (string)$child->UID;
+                $uid = (string) $child->UID;
                 $isMaster = isset($child->{'RECURRENCE-ID'}) ? 0 : 1;
                 if (isset($uidList[$uid])) {
                     $uidList[$uid]['count']++;

Indentation +534 added lines, -534 removed lines

@@ -22,540 +22,540 @@
  */
 class VCalendar extends VObject\Document {
 
-    /**
-     * The default name for this component.
-     *
-     * This should be 'VCALENDAR' or 'VCARD'.
-     *
-     * @var string
-     */
-    static $defaultName = 'VCALENDAR';
-
-    /**
-     * This is a list of components, and which classes they should map to.
-     *
-     * @var array
-     */
-    static $componentMap = [
-        'VCALENDAR'     => 'Sabre\\VObject\\Component\\VCalendar',
-        'VALARM'        => 'Sabre\\VObject\\Component\\VAlarm',
-        'VEVENT'        => 'Sabre\\VObject\\Component\\VEvent',
-        'VFREEBUSY'     => 'Sabre\\VObject\\Component\\VFreeBusy',
-        'VAVAILABILITY' => 'Sabre\\VObject\\Component\\VAvailability',
-        'AVAILABLE'     => 'Sabre\\VObject\\Component\\Available',
-        'VJOURNAL'      => 'Sabre\\VObject\\Component\\VJournal',
-        'VTIMEZONE'     => 'Sabre\\VObject\\Component\\VTimeZone',
-        'VTODO'         => 'Sabre\\VObject\\Component\\VTodo',
-    ];
-
-    /**
-     * List of value-types, and which classes they map to.
-     *
-     * @var array
-     */
-    static $valueMap = [
-        'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
-        'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
-        'CAL-ADDRESS'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'DATE'             => 'Sabre\\VObject\\Property\\ICalendar\\Date',
-        'DATE-TIME'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DURATION'         => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
-        'PERIOD'           => 'Sabre\\VObject\\Property\\ICalendar\\Period',
-        'RECUR'            => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
-        'TEXT'             => 'Sabre\\VObject\\Property\\Text',
-        'TIME'             => 'Sabre\\VObject\\Property\\Time',
-        'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
-        'URI'              => 'Sabre\\VObject\\Property\\Uri',
-        'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
-    ];
-
-    /**
-     * List of properties, and which classes they map to.
-     *
-     * @var array
-     */
-    static $propertyMap = [
-        // Calendar properties
-        'CALSCALE'      => 'Sabre\\VObject\\Property\\FlatText',
-        'METHOD'        => 'Sabre\\VObject\\Property\\FlatText',
-        'PRODID'        => 'Sabre\\VObject\\Property\\FlatText',
-        'VERSION'       => 'Sabre\\VObject\\Property\\FlatText',
-
-        // Component properties
-        'ATTACH'            => 'Sabre\\VObject\\Property\\Uri',
-        'CATEGORIES'        => 'Sabre\\VObject\\Property\\Text',
-        'CLASS'             => 'Sabre\\VObject\\Property\\FlatText',
-        'COMMENT'           => 'Sabre\\VObject\\Property\\FlatText',
-        'DESCRIPTION'       => 'Sabre\\VObject\\Property\\FlatText',
-        'GEO'               => 'Sabre\\VObject\\Property\\FloatValue',
-        'LOCATION'          => 'Sabre\\VObject\\Property\\FlatText',
-        'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\IntegerValue',
-        'PRIORITY'          => 'Sabre\\VObject\\Property\\IntegerValue',
-        'RESOURCES'         => 'Sabre\\VObject\\Property\\Text',
-        'STATUS'            => 'Sabre\\VObject\\Property\\FlatText',
-        'SUMMARY'           => 'Sabre\\VObject\\Property\\FlatText',
-
-        // Date and Time Component Properties
-        'COMPLETED'     => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTEND'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DUE'           => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTSTART'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DURATION'      => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FREEBUSY'      => 'Sabre\\VObject\\Property\\ICalendar\\Period',
-        'TRANSP'        => 'Sabre\\VObject\\Property\\FlatText',
-
-        // Time Zone Component Properties
-        'TZID'          => 'Sabre\\VObject\\Property\\FlatText',
-        'TZNAME'        => 'Sabre\\VObject\\Property\\FlatText',
-        'TZOFFSETFROM'  => 'Sabre\\VObject\\Property\\UtcOffset',
-        'TZOFFSETTO'    => 'Sabre\\VObject\\Property\\UtcOffset',
-        'TZURL'         => 'Sabre\\VObject\\Property\\Uri',
-
-        // Relationship Component Properties
-        'ATTENDEE'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'CONTACT'       => 'Sabre\\VObject\\Property\\FlatText',
-        'ORGANIZER'     => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'RECURRENCE-ID' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RELATED-TO'    => 'Sabre\\VObject\\Property\\FlatText',
-        'URL'           => 'Sabre\\VObject\\Property\\Uri',
-        'UID'           => 'Sabre\\VObject\\Property\\FlatText',
-
-        // Recurrence Component Properties
-        'EXDATE'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RDATE'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RRULE'         => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
-        'EXRULE'        => 'Sabre\\VObject\\Property\\ICalendar\\Recur', // Deprecated since rfc5545
-
-        // Alarm Component Properties
-        'ACTION'        => 'Sabre\\VObject\\Property\\FlatText',
-        'REPEAT'        => 'Sabre\\VObject\\Property\\IntegerValue',
-        'TRIGGER'       => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-
-        // Change Management Component Properties
-        'CREATED'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTSTAMP'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'LAST-MODIFIED' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'SEQUENCE'      => 'Sabre\\VObject\\Property\\IntegerValue',
-
-        // Request Status
-        'REQUEST-STATUS' => 'Sabre\\VObject\\Property\\Text',
-
-        // Additions from draft-daboo-valarm-extensions-04
-        'ALARM-AGENT'    => 'Sabre\\VObject\\Property\\Text',
-        'ACKNOWLEDGED'   => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'PROXIMITY'      => 'Sabre\\VObject\\Property\\Text',
-        'DEFAULT-ALARM'  => 'Sabre\\VObject\\Property\\Boolean',
-
-        // Additions from draft-daboo-calendar-availability-05
-        'BUSYTYPE'       => 'Sabre\\VObject\\Property\\Text',
-
-    ];
-
-    /**
-     * Returns the current document type.
-     *
-     * @return int
-     */
-    public function getDocumentType() {
-
-        return self::ICALENDAR20;
-
-    }
-
-    /**
-     * Returns a list of all 'base components'. For instance, if an Event has
-     * a recurrence rule, and one instance is overridden, the overridden event
-     * will have the same UID, but will be excluded from this list.
-     *
-     * VTIMEZONE components will always be excluded.
-     *
-     * @param string $componentName filter by component name
-     *
-     * @return VObject\Component[]
-     */
-    public function getBaseComponents($componentName = null) {
-
-        $isBaseComponent = function($component) {
-
-            if (!$component instanceof VObject\Component) {
-                return false;
-            }
-            if ($component->name === 'VTIMEZONE') {
-                return false;
-            }
-            if (isset($component->{'RECURRENCE-ID'})) {
-                return false;
-            }
-            return true;
-
-        };
-
-        if ($componentName) {
-            // Early exit
-            return array_filter(
-                $this->select($componentName),
-                $isBaseComponent
-            );
-        }
-
-        $components = [];
-        foreach ($this->children as $childGroup) {
-
-            foreach ($childGroup as $child) {
-
-                if (!$child instanceof Component) {
-                    // If one child is not a component, they all are so we skip
-                    // the entire group.
-                    continue 2;
-                }
-                if ($isBaseComponent($child)) {
-                    $components[] = $child;
-                }
-
-            }
-
-        }
-        return $components;
-
-    }
-
-    /**
-     * Returns the first component that is not a VTIMEZONE, and does not have
-     * an RECURRENCE-ID.
-     *
-     * If there is no such component, null will be returned.
-     *
-     * @param string $componentName filter by component name
-     *
-     * @return VObject\Component|null
-     */
-    public function getBaseComponent($componentName = null) {
-
-        $isBaseComponent = function($component) {
-
-            if (!$component instanceof VObject\Component) {
-                return false;
-            }
-            if ($component->name === 'VTIMEZONE') {
-                return false;
-            }
-            if (isset($component->{'RECURRENCE-ID'})) {
-                return false;
-            }
-            return true;
-
-        };
-
-        if ($componentName) {
-            foreach ($this->select($componentName) as $child) {
-                if ($isBaseComponent($child)) {
-                    return $child;
-                }
-            }
-            return null;
-        }
-
-        // Searching all components
-        foreach ($this->children as $childGroup) {
-            foreach ($childGroup as $child) {
-                if ($isBaseComponent($child)) {
-                    return $child;
-                }
-            }
-
-        }
-        return null;
-
-    }
-
-    /**
-     * Expand all events in this VCalendar object and return a new VCalendar
-     * with the expanded events.
-     *
-     * If this calendar object, has events with recurrence rules, this method
-     * can be used to expand the event into multiple sub-events.
-     *
-     * Each event will be stripped from it's recurrence information, and only
-     * the instances of the event in the specified timerange will be left
-     * alone.
-     *
-     * In addition, this method will cause timezone information to be stripped,
-     * and normalized to UTC.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     * @param DateTimeZone $timeZone reference timezone for floating dates and
-     *                     times.
-     * @return VCalendar
-     */
-    public function expand(DateTimeInterface $start, DateTimeInterface $end, DateTimeZone $timeZone = null) {
-
-        $newChildren = [];
-        $recurringEvents = [];
-
-        if (!$timeZone) {
-            $timeZone = new DateTimeZone('UTC');
-        }
-
-        $stripTimezones = function(Component $component) use ($timeZone, &$stripTimezones) {
-
-            foreach ($component->children() as $componentChild) {
-                if ($componentChild instanceof Property\ICalendar\DateTime && $componentChild->hasTime()) {
-
-                    $dt = $componentChild->getDateTimes($timeZone);
-                    // We only need to update the first timezone, because
-                    // setDateTimes will match all other timezones to the
-                    // first.
-                    $dt[0] = $dt[0]->setTimeZone(new DateTimeZone('UTC'));
-                    $componentChild->setDateTimes($dt);
-                } elseif ($componentChild instanceof Component) {
-                    $stripTimezones($componentChild);
-                }
-
-            }
-            return $component;
-
-        };
-
-        foreach ($this->children() as $child) {
-
-            if ($child instanceof Property && $child->name !== 'PRODID') {
-                // We explictly want to ignore PRODID, because we want to
-                // overwrite it with our own.
-                $newChildren[] = clone $child;
-            } elseif ($child instanceof Component && $child->name !== 'VTIMEZONE') {
-
-                // We're also stripping all VTIMEZONE objects because we're
-                // converting everything to UTC.
-                if ($child->name === 'VEVENT' && (isset($child->{'RECURRENCE-ID'}) || isset($child->RRULE) || isset($child->RDATE))) {
-                    // Handle these a bit later.
-                    $uid = (string)$child->UID;
-                    if (!$uid) {
-                        throw new InvalidDataException('Every VEVENT object must have a UID property');
-                    }
-                    if (isset($recurringEvents[$uid])) {
-                        $recurringEvents[$uid][] = clone $child;
-                    } else {
-                        $recurringEvents[$uid] = [clone $child];
-                    }
-                } elseif ($child->name === 'VEVENT' && $child->isInTimeRange($start, $end)) {
-                    $newChildren[] = $stripTimezones(clone $child);
-                }
-
-            }
-
-        }
-
-        foreach ($recurringEvents as $events) {
-
-            try {
-                $it = new EventIterator($events, $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.
-                continue;
-            }
-            $it->fastForward($start);
-
-            while ($it->valid() && $it->getDTStart() < $end) {
-
-                if ($it->getDTEnd() > $start) {
-
-                    $newChildren[] = $stripTimezones($it->getEventObject());
-
-                }
-                $it->next();
-
-            }
-
-        }
-
-        return new self($newChildren);
-
-    }
-
-    /**
-     * This method should return a list of default property values.
-     *
-     * @return array
-     */
-    protected function getDefaults() {
-
-        return [
-            'VERSION'  => '2.0',
-            'PRODID'   => '-//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN',
-            'CALSCALE' => 'GREGORIAN',
-        ];
-
-    }
-
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules() {
-
-        return [
-            'PRODID'  => 1,
-            'VERSION' => 1,
-
-            'CALSCALE' => '?',
-            'METHOD'   => '?',
-        ];
-
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   Node::REPAIR - May attempt to automatically repair the problem.
-     *   Node::PROFILE_CARDDAV - Validate the vCard for CardDAV purposes.
-     *   Node::PROFILE_CALDAV - Validate the iCalendar for CalDAV purposes.
-     *
-     * 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 - A warning.
-     *   3 - An error.
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $warnings = parent::validate($options);
-
-        if ($ver = $this->VERSION) {
-            if ((string)$ver !== '2.0') {
-                $warnings[] = [
-                    'level'   => 3,
-                    'message' => 'Only iCalendar version 2.0 as defined in rfc5545 is supported.',
-                    'node'    => $this,
-                ];
-            }
-
-        }
-
-        $uidList = [];
-        $componentsFound = 0;
-        $componentTypes = [];
-
-        foreach ($this->children() as $child) {
-            if ($child instanceof Component) {
-                $componentsFound++;
-
-                if (!in_array($child->name, ['VEVENT', 'VTODO', 'VJOURNAL'])) {
-                    continue;
-                }
-                $componentTypes[] = $child->name;
-
-                $uid = (string)$child->UID;
-                $isMaster = isset($child->{'RECURRENCE-ID'}) ? 0 : 1;
-                if (isset($uidList[$uid])) {
-                    $uidList[$uid]['count']++;
-                    if ($isMaster && $uidList[$uid]['hasMaster']) {
-                        $warnings[] = [
-                            'level'   => 3,
-                            'message' => 'More than one master object was found for the object with UID ' . $uid,
-                            'node'    => $this,
-                        ];
-                    }
-                    $uidList[$uid]['hasMaster'] += $isMaster;
-                } else {
-                    $uidList[$uid] = [
-                        'count'     => 1,
-                        'hasMaster' => $isMaster,
-                    ];
-                }
-
-            }
-        }
-
-        if ($componentsFound === 0) {
-            $warnings[] = [
-                'level'   => 3,
-                'message' => 'An iCalendar object must have at least 1 component.',
-                'node'    => $this,
-            ];
-        }
-
-        if ($options & self::PROFILE_CALDAV) {
-            if (count($uidList) > 1) {
-                $warnings[] = [
-                    'level'   => 3,
-                    'message' => 'A calendar object on a CalDAV server may only have components with the same UID.',
-                    'node'    => $this,
-                ];
-            }
-            if (count($componentTypes) === 0) {
-                $warnings[] = [
-                    'level'   => 3,
-                    'message' => 'A calendar object on a CalDAV server must have at least 1 component (VTODO, VEVENT, VJOURNAL).',
-                    'node'    => $this,
-                ];
-            }
-            if (count(array_unique($componentTypes)) > 1) {
-                $warnings[] = [
-                    'level'   => 3,
-                    'message' => 'A calendar object on a CalDAV server may only have 1 type of component (VEVENT, VTODO or VJOURNAL).',
-                    'node'    => $this,
-                ];
-            }
-
-            if (isset($this->METHOD)) {
-                $warnings[] = [
-                    'level'   => 3,
-                    'message' => 'A calendar object on a CalDAV server MUST NOT have a METHOD property.',
-                    'node'    => $this,
-                ];
-            }
-        }
-
-        return $warnings;
-
-    }
-
-    /**
-     * Returns all components with a specific UID value.
-     *
-     * @return array
-     */
-    public function getByUID($uid) {
-
-        return array_filter($this->getComponents(), function($item) use ($uid) {
-
-            if (!$itemUid = $item->select('UID')) {
-                return false;
-            }
-            $itemUid = current($itemUid)->getValue();
-            return $uid === $itemUid;
-
-        });
-
-    }
+	/**
+	 * The default name for this component.
+	 *
+	 * This should be 'VCALENDAR' or 'VCARD'.
+	 *
+	 * @var string
+	 */
+	static $defaultName = 'VCALENDAR';
+
+	/**
+	 * This is a list of components, and which classes they should map to.
+	 *
+	 * @var array
+	 */
+	static $componentMap = [
+		'VCALENDAR'     => 'Sabre\\VObject\\Component\\VCalendar',
+		'VALARM'        => 'Sabre\\VObject\\Component\\VAlarm',
+		'VEVENT'        => 'Sabre\\VObject\\Component\\VEvent',
+		'VFREEBUSY'     => 'Sabre\\VObject\\Component\\VFreeBusy',
+		'VAVAILABILITY' => 'Sabre\\VObject\\Component\\VAvailability',
+		'AVAILABLE'     => 'Sabre\\VObject\\Component\\Available',
+		'VJOURNAL'      => 'Sabre\\VObject\\Component\\VJournal',
+		'VTIMEZONE'     => 'Sabre\\VObject\\Component\\VTimeZone',
+		'VTODO'         => 'Sabre\\VObject\\Component\\VTodo',
+	];
+
+	/**
+	 * List of value-types, and which classes they map to.
+	 *
+	 * @var array
+	 */
+	static $valueMap = [
+		'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
+		'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
+		'CAL-ADDRESS'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
+		'DATE'             => 'Sabre\\VObject\\Property\\ICalendar\\Date',
+		'DATE-TIME'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'DURATION'         => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
+		'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
+		'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
+		'PERIOD'           => 'Sabre\\VObject\\Property\\ICalendar\\Period',
+		'RECUR'            => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
+		'TEXT'             => 'Sabre\\VObject\\Property\\Text',
+		'TIME'             => 'Sabre\\VObject\\Property\\Time',
+		'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
+		'URI'              => 'Sabre\\VObject\\Property\\Uri',
+		'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
+	];
+
+	/**
+	 * List of properties, and which classes they map to.
+	 *
+	 * @var array
+	 */
+	static $propertyMap = [
+		// Calendar properties
+		'CALSCALE'      => 'Sabre\\VObject\\Property\\FlatText',
+		'METHOD'        => 'Sabre\\VObject\\Property\\FlatText',
+		'PRODID'        => 'Sabre\\VObject\\Property\\FlatText',
+		'VERSION'       => 'Sabre\\VObject\\Property\\FlatText',
+
+		// Component properties
+		'ATTACH'            => 'Sabre\\VObject\\Property\\Uri',
+		'CATEGORIES'        => 'Sabre\\VObject\\Property\\Text',
+		'CLASS'             => 'Sabre\\VObject\\Property\\FlatText',
+		'COMMENT'           => 'Sabre\\VObject\\Property\\FlatText',
+		'DESCRIPTION'       => 'Sabre\\VObject\\Property\\FlatText',
+		'GEO'               => 'Sabre\\VObject\\Property\\FloatValue',
+		'LOCATION'          => 'Sabre\\VObject\\Property\\FlatText',
+		'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\IntegerValue',
+		'PRIORITY'          => 'Sabre\\VObject\\Property\\IntegerValue',
+		'RESOURCES'         => 'Sabre\\VObject\\Property\\Text',
+		'STATUS'            => 'Sabre\\VObject\\Property\\FlatText',
+		'SUMMARY'           => 'Sabre\\VObject\\Property\\FlatText',
+
+		// Date and Time Component Properties
+		'COMPLETED'     => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'DTEND'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'DUE'           => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'DTSTART'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'DURATION'      => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
+		'FREEBUSY'      => 'Sabre\\VObject\\Property\\ICalendar\\Period',
+		'TRANSP'        => 'Sabre\\VObject\\Property\\FlatText',
+
+		// Time Zone Component Properties
+		'TZID'          => 'Sabre\\VObject\\Property\\FlatText',
+		'TZNAME'        => 'Sabre\\VObject\\Property\\FlatText',
+		'TZOFFSETFROM'  => 'Sabre\\VObject\\Property\\UtcOffset',
+		'TZOFFSETTO'    => 'Sabre\\VObject\\Property\\UtcOffset',
+		'TZURL'         => 'Sabre\\VObject\\Property\\Uri',
+
+		// Relationship Component Properties
+		'ATTENDEE'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
+		'CONTACT'       => 'Sabre\\VObject\\Property\\FlatText',
+		'ORGANIZER'     => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
+		'RECURRENCE-ID' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'RELATED-TO'    => 'Sabre\\VObject\\Property\\FlatText',
+		'URL'           => 'Sabre\\VObject\\Property\\Uri',
+		'UID'           => 'Sabre\\VObject\\Property\\FlatText',
+
+		// Recurrence Component Properties
+		'EXDATE'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'RDATE'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'RRULE'         => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
+		'EXRULE'        => 'Sabre\\VObject\\Property\\ICalendar\\Recur', // Deprecated since rfc5545
+
+		// Alarm Component Properties
+		'ACTION'        => 'Sabre\\VObject\\Property\\FlatText',
+		'REPEAT'        => 'Sabre\\VObject\\Property\\IntegerValue',
+		'TRIGGER'       => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
+
+		// Change Management Component Properties
+		'CREATED'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'DTSTAMP'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'LAST-MODIFIED' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'SEQUENCE'      => 'Sabre\\VObject\\Property\\IntegerValue',
+
+		// Request Status
+		'REQUEST-STATUS' => 'Sabre\\VObject\\Property\\Text',
+
+		// Additions from draft-daboo-valarm-extensions-04
+		'ALARM-AGENT'    => 'Sabre\\VObject\\Property\\Text',
+		'ACKNOWLEDGED'   => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+		'PROXIMITY'      => 'Sabre\\VObject\\Property\\Text',
+		'DEFAULT-ALARM'  => 'Sabre\\VObject\\Property\\Boolean',
+
+		// Additions from draft-daboo-calendar-availability-05
+		'BUSYTYPE'       => 'Sabre\\VObject\\Property\\Text',
+
+	];
+
+	/**
+	 * Returns the current document type.
+	 *
+	 * @return int
+	 */
+	public function getDocumentType() {
+
+		return self::ICALENDAR20;
+
+	}
+
+	/**
+	 * Returns a list of all 'base components'. For instance, if an Event has
+	 * a recurrence rule, and one instance is overridden, the overridden event
+	 * will have the same UID, but will be excluded from this list.
+	 *
+	 * VTIMEZONE components will always be excluded.
+	 *
+	 * @param string $componentName filter by component name
+	 *
+	 * @return VObject\Component[]
+	 */
+	public function getBaseComponents($componentName = null) {
+
+		$isBaseComponent = function($component) {
+
+			if (!$component instanceof VObject\Component) {
+				return false;
+			}
+			if ($component->name === 'VTIMEZONE') {
+				return false;
+			}
+			if (isset($component->{'RECURRENCE-ID'})) {
+				return false;
+			}
+			return true;
+
+		};
+
+		if ($componentName) {
+			// Early exit
+			return array_filter(
+				$this->select($componentName),
+				$isBaseComponent
+			);
+		}
+
+		$components = [];
+		foreach ($this->children as $childGroup) {
+
+			foreach ($childGroup as $child) {
+
+				if (!$child instanceof Component) {
+					// If one child is not a component, they all are so we skip
+					// the entire group.
+					continue 2;
+				}
+				if ($isBaseComponent($child)) {
+					$components[] = $child;
+				}
+
+			}
+
+		}
+		return $components;
+
+	}
+
+	/**
+	 * Returns the first component that is not a VTIMEZONE, and does not have
+	 * an RECURRENCE-ID.
+	 *
+	 * If there is no such component, null will be returned.
+	 *
+	 * @param string $componentName filter by component name
+	 *
+	 * @return VObject\Component|null
+	 */
+	public function getBaseComponent($componentName = null) {
+
+		$isBaseComponent = function($component) {
+
+			if (!$component instanceof VObject\Component) {
+				return false;
+			}
+			if ($component->name === 'VTIMEZONE') {
+				return false;
+			}
+			if (isset($component->{'RECURRENCE-ID'})) {
+				return false;
+			}
+			return true;
+
+		};
+
+		if ($componentName) {
+			foreach ($this->select($componentName) as $child) {
+				if ($isBaseComponent($child)) {
+					return $child;
+				}
+			}
+			return null;
+		}
+
+		// Searching all components
+		foreach ($this->children as $childGroup) {
+			foreach ($childGroup as $child) {
+				if ($isBaseComponent($child)) {
+					return $child;
+				}
+			}
+
+		}
+		return null;
+
+	}
+
+	/**
+	 * Expand all events in this VCalendar object and return a new VCalendar
+	 * with the expanded events.
+	 *
+	 * If this calendar object, has events with recurrence rules, this method
+	 * can be used to expand the event into multiple sub-events.
+	 *
+	 * Each event will be stripped from it's recurrence information, and only
+	 * the instances of the event in the specified timerange will be left
+	 * alone.
+	 *
+	 * In addition, this method will cause timezone information to be stripped,
+	 * and normalized to UTC.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 * @param DateTimeZone $timeZone reference timezone for floating dates and
+	 *                     times.
+	 * @return VCalendar
+	 */
+	public function expand(DateTimeInterface $start, DateTimeInterface $end, DateTimeZone $timeZone = null) {
+
+		$newChildren = [];
+		$recurringEvents = [];
+
+		if (!$timeZone) {
+			$timeZone = new DateTimeZone('UTC');
+		}
+
+		$stripTimezones = function(Component $component) use ($timeZone, &$stripTimezones) {
+
+			foreach ($component->children() as $componentChild) {
+				if ($componentChild instanceof Property\ICalendar\DateTime && $componentChild->hasTime()) {
+
+					$dt = $componentChild->getDateTimes($timeZone);
+					// We only need to update the first timezone, because
+					// setDateTimes will match all other timezones to the
+					// first.
+					$dt[0] = $dt[0]->setTimeZone(new DateTimeZone('UTC'));
+					$componentChild->setDateTimes($dt);
+				} elseif ($componentChild instanceof Component) {
+					$stripTimezones($componentChild);
+				}
+
+			}
+			return $component;
+
+		};
+
+		foreach ($this->children() as $child) {
+
+			if ($child instanceof Property && $child->name !== 'PRODID') {
+				// We explictly want to ignore PRODID, because we want to
+				// overwrite it with our own.
+				$newChildren[] = clone $child;
+			} elseif ($child instanceof Component && $child->name !== 'VTIMEZONE') {
+
+				// We're also stripping all VTIMEZONE objects because we're
+				// converting everything to UTC.
+				if ($child->name === 'VEVENT' && (isset($child->{'RECURRENCE-ID'}) || isset($child->RRULE) || isset($child->RDATE))) {
+					// Handle these a bit later.
+					$uid = (string)$child->UID;
+					if (!$uid) {
+						throw new InvalidDataException('Every VEVENT object must have a UID property');
+					}
+					if (isset($recurringEvents[$uid])) {
+						$recurringEvents[$uid][] = clone $child;
+					} else {
+						$recurringEvents[$uid] = [clone $child];
+					}
+				} elseif ($child->name === 'VEVENT' && $child->isInTimeRange($start, $end)) {
+					$newChildren[] = $stripTimezones(clone $child);
+				}
+
+			}
+
+		}
+
+		foreach ($recurringEvents as $events) {
+
+			try {
+				$it = new EventIterator($events, $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.
+				continue;
+			}
+			$it->fastForward($start);
+
+			while ($it->valid() && $it->getDTStart() < $end) {
+
+				if ($it->getDTEnd() > $start) {
+
+					$newChildren[] = $stripTimezones($it->getEventObject());
+
+				}
+				$it->next();
+
+			}
+
+		}
+
+		return new self($newChildren);
+
+	}
+
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults() {
+
+		return [
+			'VERSION'  => '2.0',
+			'PRODID'   => '-//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN',
+			'CALSCALE' => 'GREGORIAN',
+		];
+
+	}
+
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules() {
+
+		return [
+			'PRODID'  => 1,
+			'VERSION' => 1,
+
+			'CALSCALE' => '?',
+			'METHOD'   => '?',
+		];
+
+	}
+
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   Node::REPAIR - May attempt to automatically repair the problem.
+	 *   Node::PROFILE_CARDDAV - Validate the vCard for CardDAV purposes.
+	 *   Node::PROFILE_CALDAV - Validate the iCalendar for CalDAV purposes.
+	 *
+	 * 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 - A warning.
+	 *   3 - An error.
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0) {
+
+		$warnings = parent::validate($options);
+
+		if ($ver = $this->VERSION) {
+			if ((string)$ver !== '2.0') {
+				$warnings[] = [
+					'level'   => 3,
+					'message' => 'Only iCalendar version 2.0 as defined in rfc5545 is supported.',
+					'node'    => $this,
+				];
+			}
+
+		}
+
+		$uidList = [];
+		$componentsFound = 0;
+		$componentTypes = [];
+
+		foreach ($this->children() as $child) {
+			if ($child instanceof Component) {
+				$componentsFound++;
+
+				if (!in_array($child->name, ['VEVENT', 'VTODO', 'VJOURNAL'])) {
+					continue;
+				}
+				$componentTypes[] = $child->name;
+
+				$uid = (string)$child->UID;
+				$isMaster = isset($child->{'RECURRENCE-ID'}) ? 0 : 1;
+				if (isset($uidList[$uid])) {
+					$uidList[$uid]['count']++;
+					if ($isMaster && $uidList[$uid]['hasMaster']) {
+						$warnings[] = [
+							'level'   => 3,
+							'message' => 'More than one master object was found for the object with UID ' . $uid,
+							'node'    => $this,
+						];
+					}
+					$uidList[$uid]['hasMaster'] += $isMaster;
+				} else {
+					$uidList[$uid] = [
+						'count'     => 1,
+						'hasMaster' => $isMaster,
+					];
+				}
+
+			}
+		}
+
+		if ($componentsFound === 0) {
+			$warnings[] = [
+				'level'   => 3,
+				'message' => 'An iCalendar object must have at least 1 component.',
+				'node'    => $this,
+			];
+		}
+
+		if ($options & self::PROFILE_CALDAV) {
+			if (count($uidList) > 1) {
+				$warnings[] = [
+					'level'   => 3,
+					'message' => 'A calendar object on a CalDAV server may only have components with the same UID.',
+					'node'    => $this,
+				];
+			}
+			if (count($componentTypes) === 0) {
+				$warnings[] = [
+					'level'   => 3,
+					'message' => 'A calendar object on a CalDAV server must have at least 1 component (VTODO, VEVENT, VJOURNAL).',
+					'node'    => $this,
+				];
+			}
+			if (count(array_unique($componentTypes)) > 1) {
+				$warnings[] = [
+					'level'   => 3,
+					'message' => 'A calendar object on a CalDAV server may only have 1 type of component (VEVENT, VTODO or VJOURNAL).',
+					'node'    => $this,
+				];
+			}
+
+			if (isset($this->METHOD)) {
+				$warnings[] = [
+					'level'   => 3,
+					'message' => 'A calendar object on a CalDAV server MUST NOT have a METHOD property.',
+					'node'    => $this,
+				];
+			}
+		}
+
+		return $warnings;
+
+	}
+
+	/**
+	 * Returns all components with a specific UID value.
+	 *
+	 * @return array
+	 */
+	public function getByUID($uid) {
+
+		return array_filter($this->getComponents(), function($item) use ($uid) {
+
+			if (!$itemUid = $item->select('UID')) {
+				return false;
+			}
+			$itemUid = current($itemUid)->getValue();
+			return $uid === $itemUid;
+
+		});
+
+	}
 
 
 }

libraries/SabreDAV/VObject/Component/VCard.php

Doc Comments -1 removed lines

@@ -383,7 +383,6 @@
      * If neither of those parameters are specified, the first is returned, if
      * a field with that name does not exist, null is returned.
      *
-     * @param string $fieldName
      *
      * @return VObject\Property|null
      */

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
     static $valueMap = [
         'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
         'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
-        'CONTENT-ID'       => 'Sabre\\VObject\\Property\\FlatText',   // vCard 2.1 only
+        'CONTENT-ID'       => 'Sabre\\VObject\\Property\\FlatText', // vCard 2.1 only
         'DATE'             => 'Sabre\\VObject\\Property\\VCard\\Date',
         'DATE-TIME'        => 'Sabre\\VObject\\Property\\VCard\\DateTime',
         'DATE-AND-OR-TIME' => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
@@ -148,7 +148,7 @@ 
 
         if (!$this->version) {
 
-            $version = (string)$this->VERSION;
+            $version = (string) $this->VERSION;
 
             switch ($version) {
                 case '2.1' :
@@ -233,7 +233,7 @@ 
 
         $version = $this->select('VERSION');
         if (count($version) === 1) {
-            $version = (string)$this->VERSION;
+            $version = (string) $this->VERSION;
             if ($version !== '2.1' && $version !== '3.0' && $version !== '4.0') {
                 $warnings[] = [
                     'level'   => 3,
@@ -283,7 +283,7 @@ 
                 // We're going to try to see if we can use the contents of the
                 // N property.
                 if (isset($this->N)) {
-                    $value = explode(';', (string)$this->N);
+                    $value = explode(';', (string) $this->N);
                     if (isset($value[1]) && $value[1]) {
                         $this->FN = $value[1] . ' ' . $value[0];
                     } else {
@@ -293,7 +293,7 @@ 
 
                 // Otherwise, the ORG property may work
                 } elseif (isset($this->ORG)) {
-                    $this->FN = (string)$this->ORG;
+                    $this->FN = (string) $this->ORG;
                     $repaired = true;
                 }
 

Indentation +520 added lines, -520 removed lines

@@ -17,537 +17,537 @@
  */
 class VCard extends VObject\Document {
 
-    /**
-     * The default name for this component.
-     *
-     * This should be 'VCALENDAR' or 'VCARD'.
-     *
-     * @var string
-     */
-    static $defaultName = 'VCARD';
-
-    /**
-     * Caching the version number.
-     *
-     * @var int
-     */
-    private $version = null;
-
-    /**
-     * This is a list of components, and which classes they should map to.
-     *
-     * @var array
-     */
-    static $componentMap = [
-        'VCARD' => 'Sabre\\VObject\\Component\\VCard',
-    ];
-
-    /**
-     * List of value-types, and which classes they map to.
-     *
-     * @var array
-     */
-    static $valueMap = [
-        'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
-        'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
-        'CONTENT-ID'       => 'Sabre\\VObject\\Property\\FlatText',   // vCard 2.1 only
-        'DATE'             => 'Sabre\\VObject\\Property\\VCard\\Date',
-        'DATE-TIME'        => 'Sabre\\VObject\\Property\\VCard\\DateTime',
-        'DATE-AND-OR-TIME' => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
-        'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
-        'LANGUAGE-TAG'     => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
-        'TIMESTAMP'        => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
-        'TEXT'             => 'Sabre\\VObject\\Property\\Text',
-        'TIME'             => 'Sabre\\VObject\\Property\\Time',
-        'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
-        'URI'              => 'Sabre\\VObject\\Property\\Uri',
-        'URL'              => 'Sabre\\VObject\\Property\\Uri', // vCard 2.1 only
-        'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
-    ];
-
-    /**
-     * List of properties, and which classes they map to.
-     *
-     * @var array
-     */
-    static $propertyMap = [
-
-        // vCard 2.1 properties and up
-        'N'       => 'Sabre\\VObject\\Property\\Text',
-        'FN'      => 'Sabre\\VObject\\Property\\FlatText',
-        'PHOTO'   => 'Sabre\\VObject\\Property\\Binary',
-        'BDAY'    => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
-        'ADR'     => 'Sabre\\VObject\\Property\\Text',
-        'LABEL'   => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-        'TEL'     => 'Sabre\\VObject\\Property\\FlatText',
-        'EMAIL'   => 'Sabre\\VObject\\Property\\FlatText',
-        'MAILER'  => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-        'GEO'     => 'Sabre\\VObject\\Property\\FlatText',
-        'TITLE'   => 'Sabre\\VObject\\Property\\FlatText',
-        'ROLE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'LOGO'    => 'Sabre\\VObject\\Property\\Binary',
-        // 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
-                                 // not supported at the moment
-        'ORG'     => 'Sabre\\VObject\\Property\\Text',
-        'NOTE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'REV'     => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
-        'SOUND'   => 'Sabre\\VObject\\Property\\FlatText',
-        'URL'     => 'Sabre\\VObject\\Property\\Uri',
-        'UID'     => 'Sabre\\VObject\\Property\\FlatText',
-        'VERSION' => 'Sabre\\VObject\\Property\\FlatText',
-        'KEY'     => 'Sabre\\VObject\\Property\\FlatText',
-        'TZ'      => 'Sabre\\VObject\\Property\\Text',
-
-        // vCard 3.0 properties
-        'CATEGORIES'  => 'Sabre\\VObject\\Property\\Text',
-        'SORT-STRING' => 'Sabre\\VObject\\Property\\FlatText',
-        'PRODID'      => 'Sabre\\VObject\\Property\\FlatText',
-        'NICKNAME'    => 'Sabre\\VObject\\Property\\Text',
-        'CLASS'       => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-
-        // rfc2739 properties
-        'FBURL'        => 'Sabre\\VObject\\Property\\Uri',
-        'CAPURI'       => 'Sabre\\VObject\\Property\\Uri',
-        'CALURI'       => 'Sabre\\VObject\\Property\\Uri',
-        'CALADRURI'    => 'Sabre\\VObject\\Property\\Uri',
-
-        // rfc4770 properties
-        'IMPP'         => 'Sabre\\VObject\\Property\\Uri',
-
-        // vCard 4.0 properties
-        'SOURCE'       => 'Sabre\\VObject\\Property\\Uri',
-        'XML'          => 'Sabre\\VObject\\Property\\FlatText',
-        'ANNIVERSARY'  => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
-        'CLIENTPIDMAP' => 'Sabre\\VObject\\Property\\Text',
-        'LANG'         => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
-        'GENDER'       => 'Sabre\\VObject\\Property\\Text',
-        'KIND'         => 'Sabre\\VObject\\Property\\FlatText',
-        'MEMBER'       => 'Sabre\\VObject\\Property\\Uri',
-        'RELATED'      => 'Sabre\\VObject\\Property\\Uri',
-
-        // rfc6474 properties
-        'BIRTHPLACE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'DEATHPLACE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'DEATHDATE'     => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
-
-        // rfc6715 properties
-        'EXPERTISE'     => 'Sabre\\VObject\\Property\\FlatText',
-        'HOBBY'         => 'Sabre\\VObject\\Property\\FlatText',
-        'INTEREST'      => 'Sabre\\VObject\\Property\\FlatText',
-        'ORG-DIRECTORY' => 'Sabre\\VObject\\Property\\FlatText',
-
-    ];
-
-    /**
-     * Returns the current document type.
-     *
-     * @return int
-     */
-    public function getDocumentType() {
-
-        if (!$this->version) {
-
-            $version = (string)$this->VERSION;
-
-            switch ($version) {
-                case '2.1' :
-                    $this->version = self::VCARD21;
-                    break;
-                case '3.0' :
-                    $this->version = self::VCARD30;
-                    break;
-                case '4.0' :
-                    $this->version = self::VCARD40;
-                    break;
-                default :
-                    // We don't want to cache the version if it's unknown,
-                    // because we might get a version property in a bit.
-                    return self::UNKNOWN;
-            }
-        }
-
-        return $this->version;
-
-    }
-
-    /**
-     * Converts the document to a different vcard version.
-     *
-     * Use one of the VCARD constants for the target. This method will return
-     * a copy of the vcard in the new version.
-     *
-     * At the moment the only supported conversion is from 3.0 to 4.0.
-     *
-     * If input and output version are identical, a clone is returned.
-     *
-     * @param int $target
-     *
-     * @return VCard
-     */
-    public function convert($target) {
-
-        $converter = new VObject\VCardConverter();
-        return $converter->convert($this, $target);
-
-    }
-
-    /**
-     * VCards with version 2.1, 3.0 and 4.0 are found.
-     *
-     * If the VCARD doesn't know its version, 2.1 is assumed.
-     */
-    const DEFAULT_VERSION = self::VCARD21;
-
-    /**
-     * 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) {
-
-        $warnings = [];
-
-        $versionMap = [
-            self::VCARD21 => '2.1',
-            self::VCARD30 => '3.0',
-            self::VCARD40 => '4.0',
-        ];
-
-        $version = $this->select('VERSION');
-        if (count($version) === 1) {
-            $version = (string)$this->VERSION;
-            if ($version !== '2.1' && $version !== '3.0' && $version !== '4.0') {
-                $warnings[] = [
-                    'level'   => 3,
-                    'message' => 'Only vcard version 4.0 (RFC6350), version 3.0 (RFC2426) or version 2.1 (icm-vcard-2.1) are supported.',
-                    'node'    => $this,
-                ];
-                if ($options & self::REPAIR) {
-                    $this->VERSION = $versionMap[self::DEFAULT_VERSION];
-                }
-            }
-            if ($version === '2.1' && ($options & self::PROFILE_CARDDAV)) {
-                $warnings[] = [
-                    'level'   => 3,
-                    'message' => 'CardDAV servers are not allowed to accept vCard 2.1.',
-                    'node'    => $this,
-                ];
-            }
-
-        }
-        $uid = $this->select('UID');
-        if (count($uid) === 0) {
-            if ($options & self::PROFILE_CARDDAV) {
-                // Required for CardDAV
-                $warningLevel = 3;
-                $message = 'vCards on CardDAV servers MUST have a UID property.';
-            } else {
-                // Not required for regular vcards
-                $warningLevel = 2;
-                $message = 'Adding a UID to a vCard property is recommended.';
-            }
-            if ($options & self::REPAIR) {
-                $this->UID = VObject\UUIDUtil::getUUID();
-                $warningLevel = 1;
-            }
-            $warnings[] = [
-                'level'   => $warningLevel,
-                'message' => $message,
-                'node'    => $this,
-            ];
-        }
-
-        $fn = $this->select('FN');
-        if (count($fn) !== 1) {
-
-            $repaired = false;
-            if (($options & self::REPAIR) && count($fn) === 0) {
-                // We're going to try to see if we can use the contents of the
-                // N property.
-                if (isset($this->N)) {
-                    $value = explode(';', (string)$this->N);
-                    if (isset($value[1]) && $value[1]) {
-                        $this->FN = $value[1] . ' ' . $value[0];
-                    } else {
-                        $this->FN = $value[0];
-                    }
-                    $repaired = true;
-
-                // Otherwise, the ORG property may work
-                } elseif (isset($this->ORG)) {
-                    $this->FN = (string)$this->ORG;
-                    $repaired = true;
-                }
-
-            }
-            $warnings[] = [
-                'level'   => $repaired ? 1 : 3,
-                'message' => 'The FN property must appear in the VCARD component exactly 1 time',
-                'node'    => $this,
-            ];
-        }
-
-        return array_merge(
-            parent::validate($options),
-            $warnings
-        );
-
-    }
-
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules() {
-
-        return [
-            'ADR'          => '*',
-            'ANNIVERSARY'  => '?',
-            'BDAY'         => '?',
-            'CALADRURI'    => '*',
-            'CALURI'       => '*',
-            'CATEGORIES'   => '*',
-            'CLIENTPIDMAP' => '*',
-            'EMAIL'        => '*',
-            'FBURL'        => '*',
-            'IMPP'         => '*',
-            'GENDER'       => '?',
-            'GEO'          => '*',
-            'KEY'          => '*',
-            'KIND'         => '?',
-            'LANG'         => '*',
-            'LOGO'         => '*',
-            'MEMBER'       => '*',
-            'N'            => '?',
-            'NICKNAME'     => '*',
-            'NOTE'         => '*',
-            'ORG'          => '*',
-            'PHOTO'        => '*',
-            'PRODID'       => '?',
-            'RELATED'      => '*',
-            'REV'          => '?',
-            'ROLE'         => '*',
-            'SOUND'        => '*',
-            'SOURCE'       => '*',
-            'TEL'          => '*',
-            'TITLE'        => '*',
-            'TZ'           => '*',
-            'URL'          => '*',
-            'VERSION'      => '1',
-            'XML'          => '*',
-
-            // FN is commented out, because it's already handled by the
-            // validate function, which may also try to repair it.
-            // 'FN'           => '+',
-            'UID'          => '?',
-        ];
-
-    }
-
-    /**
-     * Returns a preferred field.
-     *
-     * VCards can indicate wether a field such as ADR, TEL or EMAIL is
-     * preferred by specifying TYPE=PREF (vcard 2.1, 3) or PREF=x (vcard 4, x
-     * being a number between 1 and 100).
-     *
-     * If neither of those parameters are specified, the first is returned, if
-     * a field with that name does not exist, null is returned.
-     *
-     * @param string $fieldName
-     *
-     * @return VObject\Property|null
-     */
-    public function preferred($propertyName) {
-
-        $preferred = null;
-        $lastPref = 101;
-        foreach ($this->select($propertyName) as $field) {
-
-            $pref = 101;
-            if (isset($field['TYPE']) && $field['TYPE']->has('PREF')) {
-                $pref = 1;
-            } elseif (isset($field['PREF'])) {
-                $pref = $field['PREF']->getValue();
-            }
-
-            if ($pref < $lastPref || is_null($preferred)) {
-                $preferred = $field;
-                $lastPref = $pref;
-            }
-
-        }
-        return $preferred;
-
-    }
-
-    /**
-     * Returns a property with a specific TYPE value (ADR, TEL, or EMAIL).
-     *
-     * This function will return null if the property does not exist. If there are
-     * multiple properties with the same TYPE value, only one will be returned.
-     *
-     * @param string $propertyName
-     * @param string $type
-     *
-     * @return VObject\Property|null
-     */
-    public function getByType($propertyName, $type) {
-        foreach ($this->select($propertyName) as $field) {
-            if (isset($field['TYPE']) && $field['TYPE']->has($type)) {
-                return $field;
-            }
-        }
-    }
-
-    /**
-     * This method should return a list of default property values.
-     *
-     * @return array
-     */
-    protected function getDefaults() {
-
-        return [
-            'VERSION' => '4.0',
-            'PRODID'  => '-//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN',
-            'UID'     => 'sabre-vobject-' . VObject\UUIDUtil::getUUID(),
-        ];
-
-    }
-
-    /**
-     * This method returns an array, with the representation as it should be
-     * encoded in json. This is used to create jCard or jCal documents.
-     *
-     * @return array
-     */
-    public function jsonSerialize() {
-
-        // A vcard does not have sub-components, so we're overriding this
-        // method to remove that array element.
-        $properties = [];
-
-        foreach ($this->children() as $child) {
-            $properties[] = $child->jsonSerialize();
-        }
-
-        return [
-            strtolower($this->name),
-            $properties,
-        ];
-
-    }
-
-    /**
-     * This method serializes the data into XML. This is used to create xCard or
-     * xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    public function xmlSerialize(Xml\Writer $writer) {
-
-        $propertiesByGroup = [];
-
-        foreach ($this->children() as $property) {
-
-            $group = $property->group;
-
-            if (!isset($propertiesByGroup[$group])) {
-                $propertiesByGroup[$group] = [];
-            }
-
-            $propertiesByGroup[$group][] = $property;
-
-        }
-
-        $writer->startElement(strtolower($this->name));
-
-        foreach ($propertiesByGroup as $group => $properties) {
-
-            if (!empty($group)) {
-
-                $writer->startElement('group');
-                $writer->writeAttribute('name', strtolower($group));
+	/**
+	 * The default name for this component.
+	 *
+	 * This should be 'VCALENDAR' or 'VCARD'.
+	 *
+	 * @var string
+	 */
+	static $defaultName = 'VCARD';
+
+	/**
+	 * Caching the version number.
+	 *
+	 * @var int
+	 */
+	private $version = null;
+
+	/**
+	 * This is a list of components, and which classes they should map to.
+	 *
+	 * @var array
+	 */
+	static $componentMap = [
+		'VCARD' => 'Sabre\\VObject\\Component\\VCard',
+	];
+
+	/**
+	 * List of value-types, and which classes they map to.
+	 *
+	 * @var array
+	 */
+	static $valueMap = [
+		'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
+		'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
+		'CONTENT-ID'       => 'Sabre\\VObject\\Property\\FlatText',   // vCard 2.1 only
+		'DATE'             => 'Sabre\\VObject\\Property\\VCard\\Date',
+		'DATE-TIME'        => 'Sabre\\VObject\\Property\\VCard\\DateTime',
+		'DATE-AND-OR-TIME' => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
+		'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
+		'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
+		'LANGUAGE-TAG'     => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
+		'TIMESTAMP'        => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
+		'TEXT'             => 'Sabre\\VObject\\Property\\Text',
+		'TIME'             => 'Sabre\\VObject\\Property\\Time',
+		'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
+		'URI'              => 'Sabre\\VObject\\Property\\Uri',
+		'URL'              => 'Sabre\\VObject\\Property\\Uri', // vCard 2.1 only
+		'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
+	];
+
+	/**
+	 * List of properties, and which classes they map to.
+	 *
+	 * @var array
+	 */
+	static $propertyMap = [
+
+		// vCard 2.1 properties and up
+		'N'       => 'Sabre\\VObject\\Property\\Text',
+		'FN'      => 'Sabre\\VObject\\Property\\FlatText',
+		'PHOTO'   => 'Sabre\\VObject\\Property\\Binary',
+		'BDAY'    => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
+		'ADR'     => 'Sabre\\VObject\\Property\\Text',
+		'LABEL'   => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+		'TEL'     => 'Sabre\\VObject\\Property\\FlatText',
+		'EMAIL'   => 'Sabre\\VObject\\Property\\FlatText',
+		'MAILER'  => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+		'GEO'     => 'Sabre\\VObject\\Property\\FlatText',
+		'TITLE'   => 'Sabre\\VObject\\Property\\FlatText',
+		'ROLE'    => 'Sabre\\VObject\\Property\\FlatText',
+		'LOGO'    => 'Sabre\\VObject\\Property\\Binary',
+		// 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
+								 // not supported at the moment
+		'ORG'     => 'Sabre\\VObject\\Property\\Text',
+		'NOTE'    => 'Sabre\\VObject\\Property\\FlatText',
+		'REV'     => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
+		'SOUND'   => 'Sabre\\VObject\\Property\\FlatText',
+		'URL'     => 'Sabre\\VObject\\Property\\Uri',
+		'UID'     => 'Sabre\\VObject\\Property\\FlatText',
+		'VERSION' => 'Sabre\\VObject\\Property\\FlatText',
+		'KEY'     => 'Sabre\\VObject\\Property\\FlatText',
+		'TZ'      => 'Sabre\\VObject\\Property\\Text',
+
+		// vCard 3.0 properties
+		'CATEGORIES'  => 'Sabre\\VObject\\Property\\Text',
+		'SORT-STRING' => 'Sabre\\VObject\\Property\\FlatText',
+		'PRODID'      => 'Sabre\\VObject\\Property\\FlatText',
+		'NICKNAME'    => 'Sabre\\VObject\\Property\\Text',
+		'CLASS'       => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+
+		// rfc2739 properties
+		'FBURL'        => 'Sabre\\VObject\\Property\\Uri',
+		'CAPURI'       => 'Sabre\\VObject\\Property\\Uri',
+		'CALURI'       => 'Sabre\\VObject\\Property\\Uri',
+		'CALADRURI'    => 'Sabre\\VObject\\Property\\Uri',
+
+		// rfc4770 properties
+		'IMPP'         => 'Sabre\\VObject\\Property\\Uri',
+
+		// vCard 4.0 properties
+		'SOURCE'       => 'Sabre\\VObject\\Property\\Uri',
+		'XML'          => 'Sabre\\VObject\\Property\\FlatText',
+		'ANNIVERSARY'  => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
+		'CLIENTPIDMAP' => 'Sabre\\VObject\\Property\\Text',
+		'LANG'         => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
+		'GENDER'       => 'Sabre\\VObject\\Property\\Text',
+		'KIND'         => 'Sabre\\VObject\\Property\\FlatText',
+		'MEMBER'       => 'Sabre\\VObject\\Property\\Uri',
+		'RELATED'      => 'Sabre\\VObject\\Property\\Uri',
+
+		// rfc6474 properties
+		'BIRTHPLACE'    => 'Sabre\\VObject\\Property\\FlatText',
+		'DEATHPLACE'    => 'Sabre\\VObject\\Property\\FlatText',
+		'DEATHDATE'     => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
+
+		// rfc6715 properties
+		'EXPERTISE'     => 'Sabre\\VObject\\Property\\FlatText',
+		'HOBBY'         => 'Sabre\\VObject\\Property\\FlatText',
+		'INTEREST'      => 'Sabre\\VObject\\Property\\FlatText',
+		'ORG-DIRECTORY' => 'Sabre\\VObject\\Property\\FlatText',
+
+	];
+
+	/**
+	 * Returns the current document type.
+	 *
+	 * @return int
+	 */
+	public function getDocumentType() {
+
+		if (!$this->version) {
+
+			$version = (string)$this->VERSION;
+
+			switch ($version) {
+				case '2.1' :
+					$this->version = self::VCARD21;
+					break;
+				case '3.0' :
+					$this->version = self::VCARD30;
+					break;
+				case '4.0' :
+					$this->version = self::VCARD40;
+					break;
+				default :
+					// We don't want to cache the version if it's unknown,
+					// because we might get a version property in a bit.
+					return self::UNKNOWN;
+			}
+		}
+
+		return $this->version;
+
+	}
+
+	/**
+	 * Converts the document to a different vcard version.
+	 *
+	 * Use one of the VCARD constants for the target. This method will return
+	 * a copy of the vcard in the new version.
+	 *
+	 * At the moment the only supported conversion is from 3.0 to 4.0.
+	 *
+	 * If input and output version are identical, a clone is returned.
+	 *
+	 * @param int $target
+	 *
+	 * @return VCard
+	 */
+	public function convert($target) {
+
+		$converter = new VObject\VCardConverter();
+		return $converter->convert($this, $target);
+
+	}
+
+	/**
+	 * VCards with version 2.1, 3.0 and 4.0 are found.
+	 *
+	 * If the VCARD doesn't know its version, 2.1 is assumed.
+	 */
+	const DEFAULT_VERSION = self::VCARD21;
+
+	/**
+	 * 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) {
+
+		$warnings = [];
+
+		$versionMap = [
+			self::VCARD21 => '2.1',
+			self::VCARD30 => '3.0',
+			self::VCARD40 => '4.0',
+		];
+
+		$version = $this->select('VERSION');
+		if (count($version) === 1) {
+			$version = (string)$this->VERSION;
+			if ($version !== '2.1' && $version !== '3.0' && $version !== '4.0') {
+				$warnings[] = [
+					'level'   => 3,
+					'message' => 'Only vcard version 4.0 (RFC6350), version 3.0 (RFC2426) or version 2.1 (icm-vcard-2.1) are supported.',
+					'node'    => $this,
+				];
+				if ($options & self::REPAIR) {
+					$this->VERSION = $versionMap[self::DEFAULT_VERSION];
+				}
+			}
+			if ($version === '2.1' && ($options & self::PROFILE_CARDDAV)) {
+				$warnings[] = [
+					'level'   => 3,
+					'message' => 'CardDAV servers are not allowed to accept vCard 2.1.',
+					'node'    => $this,
+				];
+			}
+
+		}
+		$uid = $this->select('UID');
+		if (count($uid) === 0) {
+			if ($options & self::PROFILE_CARDDAV) {
+				// Required for CardDAV
+				$warningLevel = 3;
+				$message = 'vCards on CardDAV servers MUST have a UID property.';
+			} else {
+				// Not required for regular vcards
+				$warningLevel = 2;
+				$message = 'Adding a UID to a vCard property is recommended.';
+			}
+			if ($options & self::REPAIR) {
+				$this->UID = VObject\UUIDUtil::getUUID();
+				$warningLevel = 1;
+			}
+			$warnings[] = [
+				'level'   => $warningLevel,
+				'message' => $message,
+				'node'    => $this,
+			];
+		}
+
+		$fn = $this->select('FN');
+		if (count($fn) !== 1) {
+
+			$repaired = false;
+			if (($options & self::REPAIR) && count($fn) === 0) {
+				// We're going to try to see if we can use the contents of the
+				// N property.
+				if (isset($this->N)) {
+					$value = explode(';', (string)$this->N);
+					if (isset($value[1]) && $value[1]) {
+						$this->FN = $value[1] . ' ' . $value[0];
+					} else {
+						$this->FN = $value[0];
+					}
+					$repaired = true;
+
+				// Otherwise, the ORG property may work
+				} elseif (isset($this->ORG)) {
+					$this->FN = (string)$this->ORG;
+					$repaired = true;
+				}
+
+			}
+			$warnings[] = [
+				'level'   => $repaired ? 1 : 3,
+				'message' => 'The FN property must appear in the VCARD component exactly 1 time',
+				'node'    => $this,
+			];
+		}
+
+		return array_merge(
+			parent::validate($options),
+			$warnings
+		);
+
+	}
+
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules() {
+
+		return [
+			'ADR'          => '*',
+			'ANNIVERSARY'  => '?',
+			'BDAY'         => '?',
+			'CALADRURI'    => '*',
+			'CALURI'       => '*',
+			'CATEGORIES'   => '*',
+			'CLIENTPIDMAP' => '*',
+			'EMAIL'        => '*',
+			'FBURL'        => '*',
+			'IMPP'         => '*',
+			'GENDER'       => '?',
+			'GEO'          => '*',
+			'KEY'          => '*',
+			'KIND'         => '?',
+			'LANG'         => '*',
+			'LOGO'         => '*',
+			'MEMBER'       => '*',
+			'N'            => '?',
+			'NICKNAME'     => '*',
+			'NOTE'         => '*',
+			'ORG'          => '*',
+			'PHOTO'        => '*',
+			'PRODID'       => '?',
+			'RELATED'      => '*',
+			'REV'          => '?',
+			'ROLE'         => '*',
+			'SOUND'        => '*',
+			'SOURCE'       => '*',
+			'TEL'          => '*',
+			'TITLE'        => '*',
+			'TZ'           => '*',
+			'URL'          => '*',
+			'VERSION'      => '1',
+			'XML'          => '*',
+
+			// FN is commented out, because it's already handled by the
+			// validate function, which may also try to repair it.
+			// 'FN'           => '+',
+			'UID'          => '?',
+		];
+
+	}
+
+	/**
+	 * Returns a preferred field.
+	 *
+	 * VCards can indicate wether a field such as ADR, TEL or EMAIL is
+	 * preferred by specifying TYPE=PREF (vcard 2.1, 3) or PREF=x (vcard 4, x
+	 * being a number between 1 and 100).
+	 *
+	 * If neither of those parameters are specified, the first is returned, if
+	 * a field with that name does not exist, null is returned.
+	 *
+	 * @param string $fieldName
+	 *
+	 * @return VObject\Property|null
+	 */
+	public function preferred($propertyName) {
+
+		$preferred = null;
+		$lastPref = 101;
+		foreach ($this->select($propertyName) as $field) {
+
+			$pref = 101;
+			if (isset($field['TYPE']) && $field['TYPE']->has('PREF')) {
+				$pref = 1;
+			} elseif (isset($field['PREF'])) {
+				$pref = $field['PREF']->getValue();
+			}
+
+			if ($pref < $lastPref || is_null($preferred)) {
+				$preferred = $field;
+				$lastPref = $pref;
+			}
+
+		}
+		return $preferred;
+
+	}
+
+	/**
+	 * Returns a property with a specific TYPE value (ADR, TEL, or EMAIL).
+	 *
+	 * This function will return null if the property does not exist. If there are
+	 * multiple properties with the same TYPE value, only one will be returned.
+	 *
+	 * @param string $propertyName
+	 * @param string $type
+	 *
+	 * @return VObject\Property|null
+	 */
+	public function getByType($propertyName, $type) {
+		foreach ($this->select($propertyName) as $field) {
+			if (isset($field['TYPE']) && $field['TYPE']->has($type)) {
+				return $field;
+			}
+		}
+	}
+
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults() {
+
+		return [
+			'VERSION' => '4.0',
+			'PRODID'  => '-//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN',
+			'UID'     => 'sabre-vobject-' . VObject\UUIDUtil::getUUID(),
+		];
+
+	}
+
+	/**
+	 * This method returns an array, with the representation as it should be
+	 * encoded in json. This is used to create jCard or jCal documents.
+	 *
+	 * @return array
+	 */
+	public function jsonSerialize() {
+
+		// A vcard does not have sub-components, so we're overriding this
+		// method to remove that array element.
+		$properties = [];
+
+		foreach ($this->children() as $child) {
+			$properties[] = $child->jsonSerialize();
+		}
+
+		return [
+			strtolower($this->name),
+			$properties,
+		];
+
+	}
+
+	/**
+	 * This method serializes the data into XML. This is used to create xCard or
+	 * xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	public function xmlSerialize(Xml\Writer $writer) {
+
+		$propertiesByGroup = [];
+
+		foreach ($this->children() as $property) {
+
+			$group = $property->group;
+
+			if (!isset($propertiesByGroup[$group])) {
+				$propertiesByGroup[$group] = [];
+			}
+
+			$propertiesByGroup[$group][] = $property;
+
+		}
+
+		$writer->startElement(strtolower($this->name));
+
+		foreach ($propertiesByGroup as $group => $properties) {
+
+			if (!empty($group)) {
+
+				$writer->startElement('group');
+				$writer->writeAttribute('name', strtolower($group));
 
-            }
-
-            foreach ($properties as $property) {
-                switch ($property->name) {
+			}
+
+			foreach ($properties as $property) {
+				switch ($property->name) {
 
-                    case 'VERSION':
-                        continue;
+					case 'VERSION':
+						continue;
 
-                    case 'XML':
-                        $value = $property->getParts();
-                        $fragment = new Xml\Element\XmlFragment($value[0]);
-                        $writer->write($fragment);
-                        break;
-
-                    default:
-                        $property->xmlSerialize($writer);
-                        break;
+					case 'XML':
+						$value = $property->getParts();
+						$fragment = new Xml\Element\XmlFragment($value[0]);
+						$writer->write($fragment);
+						break;
+
+					default:
+						$property->xmlSerialize($writer);
+						break;
 
-                }
-            }
+				}
+			}
 
-            if (!empty($group)) {
-                $writer->endElement();
-            }
+			if (!empty($group)) {
+				$writer->endElement();
+			}
 
-        }
+		}
 
-        $writer->endElement();
+		$writer->endElement();
 
-    }
+	}
 
-    /**
-     * Returns the default class for a property name.
-     *
-     * @param string $propertyName
-     *
-     * @return string
-     */
-    public function getClassNameForPropertyName($propertyName) {
+	/**
+	 * Returns the default class for a property name.
+	 *
+	 * @param string $propertyName
+	 *
+	 * @return string
+	 */
+	public function getClassNameForPropertyName($propertyName) {
 
-        $className = parent::getClassNameForPropertyName($propertyName);
+		$className = parent::getClassNameForPropertyName($propertyName);
 
-        // In vCard 4, BINARY no longer exists, and we need URI instead.
-        if ($className == 'Sabre\\VObject\\Property\\Binary' && $this->getDocumentType() === self::VCARD40) {
-            return 'Sabre\\VObject\\Property\\Uri';
-        }
-        return $className;
+		// In vCard 4, BINARY no longer exists, and we need URI instead.
+		if ($className == 'Sabre\\VObject\\Property\\Binary' && $this->getDocumentType() === self::VCARD40) {
+			return 'Sabre\\VObject\\Property\\Uri';
+		}
+		return $className;
 
-    }
+	}
 
 }

libraries/SabreDAV/VObject/DateTimeParser.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,9 +2,9 @@
 
 namespace Sabre\VObject;
 
+use DateInterval;
 use DateTimeImmutable;
 use DateTimeZone;
-use DateInterval;
 
 /**
  * DateTimeParser.

Indentation +480 added lines, -480 removed lines

@@ -18,252 +18,252 @@ 
  */
 class DateTimeParser {
 
-    /**
-     * Parses an iCalendar (rfc5545) formatted datetime and returns a
-     * DateTimeImmutable object.
-     *
-     * Specifying a reference timezone is optional. It will only be used
-     * if the non-UTC format is used. The argument is used as a reference, the
-     * returned DateTimeImmutable object will still be in the UTC timezone.
-     *
-     * @param string $dt
-     * @param DateTimeZone $tz
-     *
-     * @return DateTimeImmutable
-     */
-    static function parseDateTime($dt, DateTimeZone $tz = null) {
-
-        // Format is YYYYMMDD + "T" + hhmmss
-        $result = preg_match('/^([0-9]{4})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/', $dt, $matches);
-
-        if (!$result) {
-            throw new InvalidDataException('The supplied iCalendar datetime value is incorrect: ' . $dt);
-        }
-
-        if ($matches[7] === 'Z' || is_null($tz)) {
-            $tz = new DateTimeZone('UTC');
-        }
-        $date = new DateTimeImmutable($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] . ':' . $matches[6], $tz);
-
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted date and returns a DateTimeImmutable object.
-     *
-     * @param string $date
-     * @param DateTimeZone $tz
-     *
-     * @return DateTimeImmutable
-     */
-    static function parseDate($date, DateTimeZone $tz = null) {
-
-        // Format is YYYYMMDD
-        $result = preg_match('/^([0-9]{4})([0-1][0-9])([0-3][0-9])$/', $date, $matches);
-
-        if (!$result) {
-            throw new InvalidDataException('The supplied iCalendar date value is incorrect: ' . $date);
-        }
-
-        if (is_null($tz)) {
-            $tz = new DateTimeZone('UTC');
-        }
-
-        $date = new DateTimeImmutable($matches[1] . '-' . $matches[2] . '-' . $matches[3], $tz);
-
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (RFC5545) formatted duration value.
-     *
-     * This method will either return a DateTimeInterval object, or a string
-     * suitable for strtotime or DateTime::modify.
-     *
-     * @param string $duration
-     * @param bool $asString
-     *
-     * @return DateInterval|string
-     */
-    static function parseDuration($duration, $asString = false) {
-
-        $result = preg_match('/^(?<plusminus>\+|-)?P((?<week>\d+)W)?((?<day>\d+)D)?(T((?<hour>\d+)H)?((?<minute>\d+)M)?((?<second>\d+)S)?)?$/', $duration, $matches);
-        if (!$result) {
-            throw new InvalidDataException('The supplied iCalendar duration value is incorrect: ' . $duration);
-        }
-
-        if (!$asString) {
-
-            $invert = false;
-
-            if ($matches['plusminus'] === '-') {
-                $invert = true;
-            }
-
-            $parts = [
-                'week',
-                'day',
-                'hour',
-                'minute',
-                'second',
-            ];
-
-            foreach ($parts as $part) {
-                $matches[$part] = isset($matches[$part]) && $matches[$part] ? (int)$matches[$part] : 0;
-            }
-
-            // We need to re-construct the $duration string, because weeks and
-            // days are not supported by DateInterval in the same string.
-            $duration = 'P';
-            $days = $matches['day'];
-
-            if ($matches['week']) {
-                $days += $matches['week'] * 7;
-            }
-
-            if ($days) {
-                $duration .= $days . 'D';
-            }
-
-            if ($matches['minute'] || $matches['second'] || $matches['hour']) {
-
-                $duration .= 'T';
-
-                if ($matches['hour']) {
-                    $duration .= $matches['hour'] . 'H';
-                }
-
-                if ($matches['minute']) {
-                    $duration .= $matches['minute'] . 'M';
-                }
-
-                if ($matches['second']) {
-                    $duration .= $matches['second'] . 'S';
-                }
-
-            }
-
-            if ($duration === 'P') {
-                $duration = 'PT0S';
-            }
-
-            $iv = new DateInterval($duration);
-
-            if ($invert) {
-                $iv->invert = true;
-            }
-
-            return $iv;
-
-        }
-
-        $parts = [
-            'week',
-            'day',
-            'hour',
-            'minute',
-            'second',
-        ];
-
-        $newDur = '';
-
-        foreach ($parts as $part) {
-            if (isset($matches[$part]) && $matches[$part]) {
-                $newDur .= ' ' . $matches[$part] . ' ' . $part . 's';
-            }
-        }
-
-        $newDur = ($matches['plusminus'] === '-' ? '-' : '+') . trim($newDur);
-
-        if ($newDur === '+') {
-            $newDur = '+0 seconds';
-        };
-
-        return $newDur;
-
-    }
-
-    /**
-     * Parses either a Date or DateTime, or Duration value.
-     *
-     * @param string $date
-     * @param DateTimeZone|string $referenceTz
-     *
-     * @return DateTimeImmutable|DateInterval
-     */
-    static function parse($date, $referenceTz = null) {
-
-        if ($date[0] === 'P' || ($date[0] === '-' && $date[1] === 'P')) {
-            return self::parseDuration($date);
-        } elseif (strlen($date) === 8) {
-            return self::parseDate($date, $referenceTz);
-        } else {
-            return self::parseDateTime($date, $referenceTz);
-        }
-
-    }
-
-    /**
-     * This method parses a vCard date and or time value.
-     *
-     * This can be used for the DATE, DATE-TIME, TIMESTAMP and
-     * DATE-AND-OR-TIME value.
-     *
-     * This method returns an array, not a DateTime value.
-     *
-     * The elements in the array are in the following order:
-     * year, month, date, hour, minute, second, timezone
-     *
-     * Almost any part of the string may be omitted. It's for example legal to
-     * just specify seconds, leave out the year, etc.
-     *
-     * Timezone is either returned as 'Z' or as '+0800'
-     *
-     * For any non-specified values null is returned.
-     *
-     * List of date formats that are supported:
-     * YYYY
-     * YYYY-MM
-     * YYYYMMDD
-     * --MMDD
-     * ---DD
-     *
-     * YYYY-MM-DD
-     * --MM-DD
-     * ---DD
-     *
-     * List of supported time formats:
-     *
-     * HH
-     * HHMM
-     * HHMMSS
-     * -MMSS
-     * --SS
-     *
-     * HH
-     * HH:MM
-     * HH:MM:SS
-     * -MM:SS
-     * --SS
-     *
-     * A full basic-format date-time string looks like :
-     * 20130603T133901
-     *
-     * A full extended-format date-time string looks like :
-     * 2013-06-03T13:39:01
-     *
-     * Times may be postfixed by a timezone offset. This can be either 'Z' for
-     * UTC, or a string like -0500 or +1100.
-     *
-     * @param string $date
-     *
-     * @return array
-     */
-    static function parseVCardDateTime($date) {
-
-        $regex = '/^
+	/**
+	 * Parses an iCalendar (rfc5545) formatted datetime and returns a
+	 * DateTimeImmutable object.
+	 *
+	 * Specifying a reference timezone is optional. It will only be used
+	 * if the non-UTC format is used. The argument is used as a reference, the
+	 * returned DateTimeImmutable object will still be in the UTC timezone.
+	 *
+	 * @param string $dt
+	 * @param DateTimeZone $tz
+	 *
+	 * @return DateTimeImmutable
+	 */
+	static function parseDateTime($dt, DateTimeZone $tz = null) {
+
+		// Format is YYYYMMDD + "T" + hhmmss
+		$result = preg_match('/^([0-9]{4})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/', $dt, $matches);
+
+		if (!$result) {
+			throw new InvalidDataException('The supplied iCalendar datetime value is incorrect: ' . $dt);
+		}
+
+		if ($matches[7] === 'Z' || is_null($tz)) {
+			$tz = new DateTimeZone('UTC');
+		}
+		$date = new DateTimeImmutable($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] . ':' . $matches[6], $tz);
+
+		return $date;
+
+	}
+
+	/**
+	 * Parses an iCalendar (rfc5545) formatted date and returns a DateTimeImmutable object.
+	 *
+	 * @param string $date
+	 * @param DateTimeZone $tz
+	 *
+	 * @return DateTimeImmutable
+	 */
+	static function parseDate($date, DateTimeZone $tz = null) {
+
+		// Format is YYYYMMDD
+		$result = preg_match('/^([0-9]{4})([0-1][0-9])([0-3][0-9])$/', $date, $matches);
+
+		if (!$result) {
+			throw new InvalidDataException('The supplied iCalendar date value is incorrect: ' . $date);
+		}
+
+		if (is_null($tz)) {
+			$tz = new DateTimeZone('UTC');
+		}
+
+		$date = new DateTimeImmutable($matches[1] . '-' . $matches[2] . '-' . $matches[3], $tz);
+
+		return $date;
+
+	}
+
+	/**
+	 * Parses an iCalendar (RFC5545) formatted duration value.
+	 *
+	 * This method will either return a DateTimeInterval object, or a string
+	 * suitable for strtotime or DateTime::modify.
+	 *
+	 * @param string $duration
+	 * @param bool $asString
+	 *
+	 * @return DateInterval|string
+	 */
+	static function parseDuration($duration, $asString = false) {
+
+		$result = preg_match('/^(?<plusminus>\+|-)?P((?<week>\d+)W)?((?<day>\d+)D)?(T((?<hour>\d+)H)?((?<minute>\d+)M)?((?<second>\d+)S)?)?$/', $duration, $matches);
+		if (!$result) {
+			throw new InvalidDataException('The supplied iCalendar duration value is incorrect: ' . $duration);
+		}
+
+		if (!$asString) {
+
+			$invert = false;
+
+			if ($matches['plusminus'] === '-') {
+				$invert = true;
+			}
+
+			$parts = [
+				'week',
+				'day',
+				'hour',
+				'minute',
+				'second',
+			];
+
+			foreach ($parts as $part) {
+				$matches[$part] = isset($matches[$part]) && $matches[$part] ? (int)$matches[$part] : 0;
+			}
+
+			// We need to re-construct the $duration string, because weeks and
+			// days are not supported by DateInterval in the same string.
+			$duration = 'P';
+			$days = $matches['day'];
+
+			if ($matches['week']) {
+				$days += $matches['week'] * 7;
+			}
+
+			if ($days) {
+				$duration .= $days . 'D';
+			}
+
+			if ($matches['minute'] || $matches['second'] || $matches['hour']) {
+
+				$duration .= 'T';
+
+				if ($matches['hour']) {
+					$duration .= $matches['hour'] . 'H';
+				}
+
+				if ($matches['minute']) {
+					$duration .= $matches['minute'] . 'M';
+				}
+
+				if ($matches['second']) {
+					$duration .= $matches['second'] . 'S';
+				}
+
+			}
+
+			if ($duration === 'P') {
+				$duration = 'PT0S';
+			}
+
+			$iv = new DateInterval($duration);
+
+			if ($invert) {
+				$iv->invert = true;
+			}
+
+			return $iv;
+
+		}
+
+		$parts = [
+			'week',
+			'day',
+			'hour',
+			'minute',
+			'second',
+		];
+
+		$newDur = '';
+
+		foreach ($parts as $part) {
+			if (isset($matches[$part]) && $matches[$part]) {
+				$newDur .= ' ' . $matches[$part] . ' ' . $part . 's';
+			}
+		}
+
+		$newDur = ($matches['plusminus'] === '-' ? '-' : '+') . trim($newDur);
+
+		if ($newDur === '+') {
+			$newDur = '+0 seconds';
+		};
+
+		return $newDur;
+
+	}
+
+	/**
+	 * Parses either a Date or DateTime, or Duration value.
+	 *
+	 * @param string $date
+	 * @param DateTimeZone|string $referenceTz
+	 *
+	 * @return DateTimeImmutable|DateInterval
+	 */
+	static function parse($date, $referenceTz = null) {
+
+		if ($date[0] === 'P' || ($date[0] === '-' && $date[1] === 'P')) {
+			return self::parseDuration($date);
+		} elseif (strlen($date) === 8) {
+			return self::parseDate($date, $referenceTz);
+		} else {
+			return self::parseDateTime($date, $referenceTz);
+		}
+
+	}
+
+	/**
+	 * This method parses a vCard date and or time value.
+	 *
+	 * This can be used for the DATE, DATE-TIME, TIMESTAMP and
+	 * DATE-AND-OR-TIME value.
+	 *
+	 * This method returns an array, not a DateTime value.
+	 *
+	 * The elements in the array are in the following order:
+	 * year, month, date, hour, minute, second, timezone
+	 *
+	 * Almost any part of the string may be omitted. It's for example legal to
+	 * just specify seconds, leave out the year, etc.
+	 *
+	 * Timezone is either returned as 'Z' or as '+0800'
+	 *
+	 * For any non-specified values null is returned.
+	 *
+	 * List of date formats that are supported:
+	 * YYYY
+	 * YYYY-MM
+	 * YYYYMMDD
+	 * --MMDD
+	 * ---DD
+	 *
+	 * YYYY-MM-DD
+	 * --MM-DD
+	 * ---DD
+	 *
+	 * List of supported time formats:
+	 *
+	 * HH
+	 * HHMM
+	 * HHMMSS
+	 * -MMSS
+	 * --SS
+	 *
+	 * HH
+	 * HH:MM
+	 * HH:MM:SS
+	 * -MM:SS
+	 * --SS
+	 *
+	 * A full basic-format date-time string looks like :
+	 * 20130603T133901
+	 *
+	 * A full extended-format date-time string looks like :
+	 * 2013-06-03T13:39:01
+	 *
+	 * Times may be postfixed by a timezone offset. This can be either 'Z' for
+	 * UTC, or a string like -0500 or +1100.
+	 *
+	 * @param string $date
+	 *
+	 * @return array
+	 */
+	static function parseVCardDateTime($date) {
+
+		$regex = '/^
             (?:  # date part
                 (?:
                     (?: (?<year> [0-9]{4}) (?: -)?| --)
@@ -286,10 +286,10 @@ 
             )?
             $/x';
 
-        if (!preg_match($regex, $date, $matches)) {
+		if (!preg_match($regex, $date, $matches)) {
 
-            // Attempting to parse the extended format.
-            $regex = '/^
+			// Attempting to parse the extended format.
+			$regex = '/^
                 (?: # date part
                     (?: (?<year> [0-9]{4}) - | -- )
                     (?<month> [0-9]{2}) -
@@ -311,83 +311,83 @@ 
                 )?
                 $/x';
 
-            if (!preg_match($regex, $date, $matches)) {
-                throw new InvalidDataException('Invalid vCard date-time string: ' . $date);
-            }
-
-        }
-        $parts = [
-            'year',
-            'month',
-            'date',
-            'hour',
-            'minute',
-            'second',
-            'timezone'
-        ];
-
-        $result = [];
-        foreach ($parts as $part) {
-
-            if (empty($matches[$part])) {
-                $result[$part] = null;
-            } elseif ($matches[$part] === '-' || $matches[$part] === '--') {
-                $result[$part] = null;
-            } else {
-                $result[$part] = $matches[$part];
-            }
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * This method parses a vCard TIME value.
-     *
-     * This method returns an array, not a DateTime value.
-     *
-     * The elements in the array are in the following order:
-     * hour, minute, second, timezone
-     *
-     * Almost any part of the string may be omitted. It's for example legal to
-     * just specify seconds, leave out the hour etc.
-     *
-     * Timezone is either returned as 'Z' or as '+08:00'
-     *
-     * For any non-specified values null is returned.
-     *
-     * List of supported time formats:
-     *
-     * HH
-     * HHMM
-     * HHMMSS
-     * -MMSS
-     * --SS
-     *
-     * HH
-     * HH:MM
-     * HH:MM:SS
-     * -MM:SS
-     * --SS
-     *
-     * A full basic-format time string looks like :
-     * 133901
-     *
-     * A full extended-format time string looks like :
-     * 13:39:01
-     *
-     * Times may be postfixed by a timezone offset. This can be either 'Z' for
-     * UTC, or a string like -0500 or +11:00.
-     *
-     * @param string $date
-     *
-     * @return array
-     */
-    static function parseVCardTime($date) {
-
-        $regex = '/^
+			if (!preg_match($regex, $date, $matches)) {
+				throw new InvalidDataException('Invalid vCard date-time string: ' . $date);
+			}
+
+		}
+		$parts = [
+			'year',
+			'month',
+			'date',
+			'hour',
+			'minute',
+			'second',
+			'timezone'
+		];
+
+		$result = [];
+		foreach ($parts as $part) {
+
+			if (empty($matches[$part])) {
+				$result[$part] = null;
+			} elseif ($matches[$part] === '-' || $matches[$part] === '--') {
+				$result[$part] = null;
+			} else {
+				$result[$part] = $matches[$part];
+			}
+
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * This method parses a vCard TIME value.
+	 *
+	 * This method returns an array, not a DateTime value.
+	 *
+	 * The elements in the array are in the following order:
+	 * hour, minute, second, timezone
+	 *
+	 * Almost any part of the string may be omitted. It's for example legal to
+	 * just specify seconds, leave out the hour etc.
+	 *
+	 * Timezone is either returned as 'Z' or as '+08:00'
+	 *
+	 * For any non-specified values null is returned.
+	 *
+	 * List of supported time formats:
+	 *
+	 * HH
+	 * HHMM
+	 * HHMMSS
+	 * -MMSS
+	 * --SS
+	 *
+	 * HH
+	 * HH:MM
+	 * HH:MM:SS
+	 * -MM:SS
+	 * --SS
+	 *
+	 * A full basic-format time string looks like :
+	 * 133901
+	 *
+	 * A full extended-format time string looks like :
+	 * 13:39:01
+	 *
+	 * Times may be postfixed by a timezone offset. This can be either 'Z' for
+	 * UTC, or a string like -0500 or +11:00.
+	 *
+	 * @param string $date
+	 *
+	 * @return array
+	 */
+	static function parseVCardTime($date) {
+
+		$regex = '/^
             (?<hour> [0-9]{2} | -)
             (?<minute> [0-9]{2} | -)?
             (?<second> [0-9]{2})?
@@ -401,10 +401,10 @@ 
             $/x';
 
 
-        if (!preg_match($regex, $date, $matches)) {
+		if (!preg_match($regex, $date, $matches)) {
 
-            // Attempting to parse the extended format.
-            $regex = '/^
+			// Attempting to parse the extended format.
+			$regex = '/^
                 (?: (?<hour> [0-9]{2}) : | -)
                 (?: (?<minute> [0-9]{2}) : | -)?
                 (?<second> [0-9]{2})?
@@ -417,155 +417,155 @@ 
                 )?
                 $/x';
 
-            if (!preg_match($regex, $date, $matches)) {
-                throw new InvalidDataException('Invalid vCard time string: ' . $date);
-            }
-
-        }
-        $parts = [
-            'hour',
-            'minute',
-            'second',
-            'timezone'
-        ];
-
-        $result = [];
-        foreach ($parts as $part) {
-
-            if (empty($matches[$part])) {
-                $result[$part] = null;
-            } elseif ($matches[$part] === '-') {
-                $result[$part] = null;
-            } else {
-                $result[$part] = $matches[$part];
-            }
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * This method parses a vCard date and or time value.
-     *
-     * This can be used for the DATE, DATE-TIME and
-     * DATE-AND-OR-TIME value.
-     *
-     * This method returns an array, not a DateTime value.
-     * The elements in the array are in the following order:
-     *     year, month, date, hour, minute, second, timezone
-     * Almost any part of the string may be omitted. It's for example legal to
-     * just specify seconds, leave out the year, etc.
-     *
-     * Timezone is either returned as 'Z' or as '+0800'
-     *
-     * For any non-specified values null is returned.
-     *
-     * List of date formats that are supported:
-     *     20150128
-     *     2015-01
-     *     --01
-     *     --0128
-     *     ---28
-     *
-     * List of supported time formats:
-     *     13
-     *     1353
-     *     135301
-     *     -53
-     *     -5301
-     *     --01 (unreachable, see the tests)
-     *     --01Z
-     *     --01+1234
-     *
-     * List of supported date-time formats:
-     *     20150128T13
-     *     --0128T13
-     *     ---28T13
-     *     ---28T1353
-     *     ---28T135301
-     *     ---28T13Z
-     *     ---28T13+1234
-     *
-     * See the regular expressions for all the possible patterns.
-     *
-     * Times may be postfixed by a timezone offset. This can be either 'Z' for
-     * UTC, or a string like -0500 or +1100.
-     *
-     * @param string $date
-     *
-     * @return array
-     */
-    static function parseVCardDateAndOrTime($date) {
-
-        // \d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d
-        $valueDate     = '/^(?J)(?:' .
-                         '(?<year>\d{4})(?<month>\d\d)(?<date>\d\d)' .
-                         '|(?<year>\d{4})-(?<month>\d\d)' .
-                         '|--(?<month>\d\d)(?<date>\d\d)?' .
-                         '|---(?<date>\d\d)' .
-                         ')$/';
-
-        // (\d\d(\d\d(\d\d)?)?|-\d\d(\d\d)?|--\d\d)(Z|[+\-]\d\d(\d\d)?)?
-        $valueTime     = '/^(?J)(?:' .
-                         '((?<hour>\d\d)((?<minute>\d\d)(?<second>\d\d)?)?' .
-                         '|-(?<minute>\d\d)(?<second>\d\d)?' .
-                         '|--(?<second>\d\d))' .
-                         '(?<timezone>(Z|[+\-]\d\d(\d\d)?))?' .
-                         ')$/';
-
-        // (\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?(Z|[+\-]\d\d(\d\d?)?
-        $valueDateTime = '/^(?:' .
-                         '((?<year0>\d{4})(?<month0>\d\d)(?<date0>\d\d)' .
-                         '|--(?<month1>\d\d)(?<date1>\d\d)' .
-                         '|---(?<date2>\d\d))' .
-                         'T' .
-                         '(?<hour>\d\d)((?<minute>\d\d)(?<second>\d\d)?)?' .
-                         '(?<timezone>(Z|[+\-]\d\d(\d\d?)))?' .
-                         ')$/';
-
-        // date-and-or-time is date | date-time | time
-        // in this strict order.
-
-        if (0 === preg_match($valueDate, $date, $matches)
-            && 0 === preg_match($valueDateTime, $date, $matches)
-            && 0 === preg_match($valueTime, $date, $matches)) {
-            throw new InvalidDataException('Invalid vCard date-time string: ' . $date);
-        }
-
-        $parts = [
-            'year'     => null,
-            'month'    => null,
-            'date'     => null,
-            'hour'     => null,
-            'minute'   => null,
-            'second'   => null,
-            'timezone' => null
-        ];
-
-        // The $valueDateTime expression has a bug with (?J) so we simulate it.
-        $parts['date0']  = &$parts['date'];
-        $parts['date1']  = &$parts['date'];
-        $parts['date2']  = &$parts['date'];
-        $parts['month0'] = &$parts['month'];
-        $parts['month1'] = &$parts['month'];
-        $parts['year0']  = &$parts['year'];
-
-        foreach ($parts as $part => &$value) {
-            if (!empty($matches[$part])) {
-                $value = $matches[$part];
-            }
-        }
-
-        unset($parts['date0']);
-        unset($parts['date1']);
-        unset($parts['date2']);
-        unset($parts['month0']);
-        unset($parts['month1']);
-        unset($parts['year0']);
-
-        return $parts;
-
-    }
+			if (!preg_match($regex, $date, $matches)) {
+				throw new InvalidDataException('Invalid vCard time string: ' . $date);
+			}
+
+		}
+		$parts = [
+			'hour',
+			'minute',
+			'second',
+			'timezone'
+		];
+
+		$result = [];
+		foreach ($parts as $part) {
+
+			if (empty($matches[$part])) {
+				$result[$part] = null;
+			} elseif ($matches[$part] === '-') {
+				$result[$part] = null;
+			} else {
+				$result[$part] = $matches[$part];
+			}
+
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * This method parses a vCard date and or time value.
+	 *
+	 * This can be used for the DATE, DATE-TIME and
+	 * DATE-AND-OR-TIME value.
+	 *
+	 * This method returns an array, not a DateTime value.
+	 * The elements in the array are in the following order:
+	 *     year, month, date, hour, minute, second, timezone
+	 * Almost any part of the string may be omitted. It's for example legal to
+	 * just specify seconds, leave out the year, etc.
+	 *
+	 * Timezone is either returned as 'Z' or as '+0800'
+	 *
+	 * For any non-specified values null is returned.
+	 *
+	 * List of date formats that are supported:
+	 *     20150128
+	 *     2015-01
+	 *     --01
+	 *     --0128
+	 *     ---28
+	 *
+	 * List of supported time formats:
+	 *     13
+	 *     1353
+	 *     135301
+	 *     -53
+	 *     -5301
+	 *     --01 (unreachable, see the tests)
+	 *     --01Z
+	 *     --01+1234
+	 *
+	 * List of supported date-time formats:
+	 *     20150128T13
+	 *     --0128T13
+	 *     ---28T13
+	 *     ---28T1353
+	 *     ---28T135301
+	 *     ---28T13Z
+	 *     ---28T13+1234
+	 *
+	 * See the regular expressions for all the possible patterns.
+	 *
+	 * Times may be postfixed by a timezone offset. This can be either 'Z' for
+	 * UTC, or a string like -0500 or +1100.
+	 *
+	 * @param string $date
+	 *
+	 * @return array
+	 */
+	static function parseVCardDateAndOrTime($date) {
+
+		// \d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d
+		$valueDate     = '/^(?J)(?:' .
+						 '(?<year>\d{4})(?<month>\d\d)(?<date>\d\d)' .
+						 '|(?<year>\d{4})-(?<month>\d\d)' .
+						 '|--(?<month>\d\d)(?<date>\d\d)?' .
+						 '|---(?<date>\d\d)' .
+						 ')$/';
+
+		// (\d\d(\d\d(\d\d)?)?|-\d\d(\d\d)?|--\d\d)(Z|[+\-]\d\d(\d\d)?)?
+		$valueTime     = '/^(?J)(?:' .
+						 '((?<hour>\d\d)((?<minute>\d\d)(?<second>\d\d)?)?' .
+						 '|-(?<minute>\d\d)(?<second>\d\d)?' .
+						 '|--(?<second>\d\d))' .
+						 '(?<timezone>(Z|[+\-]\d\d(\d\d)?))?' .
+						 ')$/';
+
+		// (\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?(Z|[+\-]\d\d(\d\d?)?
+		$valueDateTime = '/^(?:' .
+						 '((?<year0>\d{4})(?<month0>\d\d)(?<date0>\d\d)' .
+						 '|--(?<month1>\d\d)(?<date1>\d\d)' .
+						 '|---(?<date2>\d\d))' .
+						 'T' .
+						 '(?<hour>\d\d)((?<minute>\d\d)(?<second>\d\d)?)?' .
+						 '(?<timezone>(Z|[+\-]\d\d(\d\d?)))?' .
+						 ')$/';
+
+		// date-and-or-time is date | date-time | time
+		// in this strict order.
+
+		if (0 === preg_match($valueDate, $date, $matches)
+			&& 0 === preg_match($valueDateTime, $date, $matches)
+			&& 0 === preg_match($valueTime, $date, $matches)) {
+			throw new InvalidDataException('Invalid vCard date-time string: ' . $date);
+		}
+
+		$parts = [
+			'year'     => null,
+			'month'    => null,
+			'date'     => null,
+			'hour'     => null,
+			'minute'   => null,
+			'second'   => null,
+			'timezone' => null
+		];
+
+		// The $valueDateTime expression has a bug with (?J) so we simulate it.
+		$parts['date0']  = &$parts['date'];
+		$parts['date1']  = &$parts['date'];
+		$parts['date2']  = &$parts['date'];
+		$parts['month0'] = &$parts['month'];
+		$parts['month1'] = &$parts['month'];
+		$parts['year0']  = &$parts['year'];
+
+		foreach ($parts as $part => &$value) {
+			if (!empty($matches[$part])) {
+				$value = $matches[$part];
+			}
+		}
+
+		unset($parts['date0']);
+		unset($parts['date1']);
+		unset($parts['date2']);
+		unset($parts['month0']);
+		unset($parts['month1']);
+		unset($parts['year0']);
+
+		return $parts;
+
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -111,7 +111,7 @@ 
             ];
 
             foreach ($parts as $part) {
-                $matches[$part] = isset($matches[$part]) && $matches[$part] ? (int)$matches[$part] : 0;
+                $matches[$part] = isset($matches[$part]) && $matches[$part] ? (int) $matches[$part] : 0;
             }
 
             // We need to re-construct the $duration string, because weeks and
@@ -500,7 +500,7 @@ 
     static function parseVCardDateAndOrTime($date) {
 
         // \d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d
-        $valueDate     = '/^(?J)(?:' .
+        $valueDate = '/^(?J)(?:' .
                          '(?<year>\d{4})(?<month>\d\d)(?<date>\d\d)' .
                          '|(?<year>\d{4})-(?<month>\d\d)' .
                          '|--(?<month>\d\d)(?<date>\d\d)?' .
@@ -508,7 +508,7 @@ 
                          ')$/';
 
         // (\d\d(\d\d(\d\d)?)?|-\d\d(\d\d)?|--\d\d)(Z|[+\-]\d\d(\d\d)?)?
-        $valueTime     = '/^(?J)(?:' .
+        $valueTime = '/^(?J)(?:' .
                          '((?<hour>\d\d)((?<minute>\d\d)(?<second>\d\d)?)?' .
                          '|-(?<minute>\d\d)(?<second>\d\d)?' .
                          '|--(?<second>\d\d))' .

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
      * @param string $duration
      * @param bool $asString
      *
-     * @return DateInterval|string
+     * @return DateInterval
      */
     static function parseDuration($duration, $asString = false) {
 

libraries/SabreDAV/VObject/Document.php

Doc Comments -1 removed lines

@@ -125,7 +125,6 @@
      * otherwise, we'll assume it's a property and call createProperty instead.
      *
      * @param string $name
-     * @param string $arg1,... Unlimited number of args
      *
      * @return mixed
      */

Braces +7 added lines, -4 removed lines

@@ -171,7 +171,9 @@ 
         if (isset(static::$componentMap[$name])) {
             $class = static::$componentMap[$name];
         }
-        if (is_null($children)) $children = [];
+        if (is_null($children)) {
+        	$children = [];
+        }
         return new $class($this, $name, $children, $defaults);
 
     }
@@ -219,12 +221,13 @@ 
                 if (is_null($class)) {
                     throw new InvalidDataException('Unsupported VALUE parameter for ' . $name . ' property. You supplied "' . $parameters['VALUE'] . '"');
                 }
-            }
-            else {
+            } else {
                 $class = $this->getClassNameForPropertyName($name);
             }
         }
-        if (is_null($parameters)) $parameters = [];
+        if (is_null($parameters)) {
+        	$parameters = [];
+        }
 
         return new $class($this, $name, $value, $parameters, $group);
 

Indentation +248 added lines, -248 removed lines

@@ -18,253 +18,253 @@
  */
 abstract class Document extends Component {
 
-    /**
-     * Unknown document type.
-     */
-    const UNKNOWN = 1;
-
-    /**
-     * vCalendar 1.0.
-     */
-    const VCALENDAR10 = 2;
-
-    /**
-     * iCalendar 2.0.
-     */
-    const ICALENDAR20 = 3;
-
-    /**
-     * vCard 2.1.
-     */
-    const VCARD21 = 4;
-
-    /**
-     * vCard 3.0.
-     */
-    const VCARD30 = 5;
-
-    /**
-     * vCard 4.0.
-     */
-    const VCARD40 = 6;
-
-    /**
-     * The default name for this component.
-     *
-     * This should be 'VCALENDAR' or 'VCARD'.
-     *
-     * @var string
-     */
-    static $defaultName;
-
-    /**
-     * List of properties, and which classes they map to.
-     *
-     * @var array
-     */
-    static $propertyMap = [];
-
-    /**
-     * List of components, along with which classes they map to.
-     *
-     * @var array
-     */
-    static $componentMap = [];
-
-    /**
-     * List of value-types, and which classes they map to.
-     *
-     * @var array
-     */
-    static $valueMap = [];
-
-    /**
-     * Creates a new document.
-     *
-     * We're changing the default behavior slightly here. First, we don't want
-     * to have to specify a name (we already know it), and we want to allow
-     * children to be specified in the first argument.
-     *
-     * But, the default behavior also works.
-     *
-     * So the two sigs:
-     *
-     * new Document(array $children = [], $defaults = true);
-     * new Document(string $name, array $children = [], $defaults = true)
-     *
-     * @return void
-     */
-    public function __construct() {
-
-        $args = func_get_args();
-        if (count($args) === 0 || is_array($args[0])) {
-            array_unshift($args, $this, static::$defaultName);
-            call_user_func_array(['parent', '__construct'], $args);
-        } else {
-            array_unshift($args, $this);
-            call_user_func_array(['parent', '__construct'], $args);
-        }
-
-    }
-
-    /**
-     * Returns the current document type.
-     *
-     * @return int
-     */
-    public function getDocumentType() {
-
-        return self::UNKNOWN;
-
-    }
-
-    /**
-     * Creates a new component or property.
-     *
-     * If it's a known component, we will automatically call createComponent.
-     * otherwise, we'll assume it's a property and call createProperty instead.
-     *
-     * @param string $name
-     * @param string $arg1,... Unlimited number of args
-     *
-     * @return mixed
-     */
-    public function create($name) {
-
-        if (isset(static::$componentMap[strtoupper($name)])) {
-
-            return call_user_func_array([$this, 'createComponent'], func_get_args());
-
-        } else {
-
-            return call_user_func_array([$this, 'createProperty'], func_get_args());
-
-        }
-
-    }
-
-    /**
-     * Creates a new component.
-     *
-     * This method automatically searches for the correct component class, based
-     * on its name.
-     *
-     * You can specify the children either in key=>value syntax, in which case
-     * properties will automatically be created, or you can just pass a list of
-     * Component and Property object.
-     *
-     * By default, a set of sensible values will be added to the component. For
-     * an iCalendar object, this may be something like CALSCALE:GREGORIAN. To
-     * ensure that this does not happen, set $defaults to false.
-     *
-     * @param string $name
-     * @param array $children
-     * @param bool $defaults
-     *
-     * @return Component
-     */
-    public function createComponent($name, array $children = null, $defaults = true) {
-
-        $name = strtoupper($name);
-        $class = 'Sabre\\VObject\\Component';
-
-        if (isset(static::$componentMap[$name])) {
-            $class = static::$componentMap[$name];
-        }
-        if (is_null($children)) $children = [];
-        return new $class($this, $name, $children, $defaults);
-
-    }
-
-    /**
-     * Factory method for creating new properties.
-     *
-     * This method automatically searches for the correct property class, based
-     * on its name.
-     *
-     * You can specify the parameters either in key=>value syntax, in which case
-     * parameters will automatically be created, or you can just pass a list of
-     * Parameter objects.
-     *
-     * @param string $name
-     * @param mixed $value
-     * @param array $parameters
-     * @param string $valueType Force a specific valuetype, such as URI or TEXT
-     *
-     * @return Property
-     */
-    public function createProperty($name, $value = null, array $parameters = null, $valueType = null) {
-
-        // If there's a . in the name, it means it's prefixed by a groupname.
-        if (($i = strpos($name, '.')) !== false) {
-            $group = substr($name, 0, $i);
-            $name = strtoupper(substr($name, $i + 1));
-        } else {
-            $name = strtoupper($name);
-            $group = null;
-        }
-
-        $class = null;
-
-        if ($valueType) {
-            // The valueType argument comes first to figure out the correct
-            // class.
-            $class = $this->getClassNameForPropertyValue($valueType);
-        }
-
-        if (is_null($class)) {
-            // If a VALUE parameter is supplied, we should use that.
-            if (isset($parameters['VALUE'])) {
-                $class = $this->getClassNameForPropertyValue($parameters['VALUE']);
-                if (is_null($class)) {
-                    throw new InvalidDataException('Unsupported VALUE parameter for ' . $name . ' property. You supplied "' . $parameters['VALUE'] . '"');
-                }
-            }
-            else {
-                $class = $this->getClassNameForPropertyName($name);
-            }
-        }
-        if (is_null($parameters)) $parameters = [];
-
-        return new $class($this, $name, $value, $parameters, $group);
-
-    }
-
-    /**
-     * This method returns a full class-name for a value parameter.
-     *
-     * For instance, DTSTART may have VALUE=DATE. In that case we will look in
-     * our valueMap table and return the appropriate class name.
-     *
-     * This method returns null if we don't have a specialized class.
-     *
-     * @param string $valueParam
-     * @return string|null
-     */
-    public function getClassNameForPropertyValue($valueParam) {
-
-        $valueParam = strtoupper($valueParam);
-        if (isset(static::$valueMap[$valueParam])) {
-            return static::$valueMap[$valueParam];
-        }
-
-    }
-
-    /**
-     * Returns the default class for a property name.
-     *
-     * @param string $propertyName
-     *
-     * @return string
-     */
-    public function getClassNameForPropertyName($propertyName) {
-
-        if (isset(static::$propertyMap[$propertyName])) {
-            return static::$propertyMap[$propertyName];
-        } else {
-            return 'Sabre\\VObject\\Property\\Unknown';
-        }
-
-    }
+	/**
+	 * Unknown document type.
+	 */
+	const UNKNOWN = 1;
+
+	/**
+	 * vCalendar 1.0.
+	 */
+	const VCALENDAR10 = 2;
+
+	/**
+	 * iCalendar 2.0.
+	 */
+	const ICALENDAR20 = 3;
+
+	/**
+	 * vCard 2.1.
+	 */
+	const VCARD21 = 4;
+
+	/**
+	 * vCard 3.0.
+	 */
+	const VCARD30 = 5;
+
+	/**
+	 * vCard 4.0.
+	 */
+	const VCARD40 = 6;
+
+	/**
+	 * The default name for this component.
+	 *
+	 * This should be 'VCALENDAR' or 'VCARD'.
+	 *
+	 * @var string
+	 */
+	static $defaultName;
+
+	/**
+	 * List of properties, and which classes they map to.
+	 *
+	 * @var array
+	 */
+	static $propertyMap = [];
+
+	/**
+	 * List of components, along with which classes they map to.
+	 *
+	 * @var array
+	 */
+	static $componentMap = [];
+
+	/**
+	 * List of value-types, and which classes they map to.
+	 *
+	 * @var array
+	 */
+	static $valueMap = [];
+
+	/**
+	 * Creates a new document.
+	 *
+	 * We're changing the default behavior slightly here. First, we don't want
+	 * to have to specify a name (we already know it), and we want to allow
+	 * children to be specified in the first argument.
+	 *
+	 * But, the default behavior also works.
+	 *
+	 * So the two sigs:
+	 *
+	 * new Document(array $children = [], $defaults = true);
+	 * new Document(string $name, array $children = [], $defaults = true)
+	 *
+	 * @return void
+	 */
+	public function __construct() {
+
+		$args = func_get_args();
+		if (count($args) === 0 || is_array($args[0])) {
+			array_unshift($args, $this, static::$defaultName);
+			call_user_func_array(['parent', '__construct'], $args);
+		} else {
+			array_unshift($args, $this);
+			call_user_func_array(['parent', '__construct'], $args);
+		}
+
+	}
+
+	/**
+	 * Returns the current document type.
+	 *
+	 * @return int
+	 */
+	public function getDocumentType() {
+
+		return self::UNKNOWN;
+
+	}
+
+	/**
+	 * Creates a new component or property.
+	 *
+	 * If it's a known component, we will automatically call createComponent.
+	 * otherwise, we'll assume it's a property and call createProperty instead.
+	 *
+	 * @param string $name
+	 * @param string $arg1,... Unlimited number of args
+	 *
+	 * @return mixed
+	 */
+	public function create($name) {
+
+		if (isset(static::$componentMap[strtoupper($name)])) {
+
+			return call_user_func_array([$this, 'createComponent'], func_get_args());
+
+		} else {
+
+			return call_user_func_array([$this, 'createProperty'], func_get_args());
+
+		}
+
+	}
+
+	/**
+	 * Creates a new component.
+	 *
+	 * This method automatically searches for the correct component class, based
+	 * on its name.
+	 *
+	 * You can specify the children either in key=>value syntax, in which case
+	 * properties will automatically be created, or you can just pass a list of
+	 * Component and Property object.
+	 *
+	 * By default, a set of sensible values will be added to the component. For
+	 * an iCalendar object, this may be something like CALSCALE:GREGORIAN. To
+	 * ensure that this does not happen, set $defaults to false.
+	 *
+	 * @param string $name
+	 * @param array $children
+	 * @param bool $defaults
+	 *
+	 * @return Component
+	 */
+	public function createComponent($name, array $children = null, $defaults = true) {
+
+		$name = strtoupper($name);
+		$class = 'Sabre\\VObject\\Component';
+
+		if (isset(static::$componentMap[$name])) {
+			$class = static::$componentMap[$name];
+		}
+		if (is_null($children)) $children = [];
+		return new $class($this, $name, $children, $defaults);
+
+	}
+
+	/**
+	 * Factory method for creating new properties.
+	 *
+	 * This method automatically searches for the correct property class, based
+	 * on its name.
+	 *
+	 * You can specify the parameters either in key=>value syntax, in which case
+	 * parameters will automatically be created, or you can just pass a list of
+	 * Parameter objects.
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 * @param array $parameters
+	 * @param string $valueType Force a specific valuetype, such as URI or TEXT
+	 *
+	 * @return Property
+	 */
+	public function createProperty($name, $value = null, array $parameters = null, $valueType = null) {
+
+		// If there's a . in the name, it means it's prefixed by a groupname.
+		if (($i = strpos($name, '.')) !== false) {
+			$group = substr($name, 0, $i);
+			$name = strtoupper(substr($name, $i + 1));
+		} else {
+			$name = strtoupper($name);
+			$group = null;
+		}
+
+		$class = null;
+
+		if ($valueType) {
+			// The valueType argument comes first to figure out the correct
+			// class.
+			$class = $this->getClassNameForPropertyValue($valueType);
+		}
+
+		if (is_null($class)) {
+			// If a VALUE parameter is supplied, we should use that.
+			if (isset($parameters['VALUE'])) {
+				$class = $this->getClassNameForPropertyValue($parameters['VALUE']);
+				if (is_null($class)) {
+					throw new InvalidDataException('Unsupported VALUE parameter for ' . $name . ' property. You supplied "' . $parameters['VALUE'] . '"');
+				}
+			}
+			else {
+				$class = $this->getClassNameForPropertyName($name);
+			}
+		}
+		if (is_null($parameters)) $parameters = [];
+
+		return new $class($this, $name, $value, $parameters, $group);
+
+	}
+
+	/**
+	 * This method returns a full class-name for a value parameter.
+	 *
+	 * For instance, DTSTART may have VALUE=DATE. In that case we will look in
+	 * our valueMap table and return the appropriate class name.
+	 *
+	 * This method returns null if we don't have a specialized class.
+	 *
+	 * @param string $valueParam
+	 * @return string|null
+	 */
+	public function getClassNameForPropertyValue($valueParam) {
+
+		$valueParam = strtoupper($valueParam);
+		if (isset(static::$valueMap[$valueParam])) {
+			return static::$valueMap[$valueParam];
+		}
+
+	}
+
+	/**
+	 * Returns the default class for a property name.
+	 *
+	 * @param string $propertyName
+	 *
+	 * @return string
+	 */
+	public function getClassNameForPropertyName($propertyName) {
+
+		if (isset(static::$propertyMap[$propertyName])) {
+			return static::$propertyMap[$propertyName];
+		} else {
+			return 'Sabre\\VObject\\Property\\Unknown';
+		}
+
+	}
 
 }

libraries/SabreDAV/VObject/FreeBusyGenerator.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject;
 
-use DateTimeInterface;
 use DateTimeImmutable;
+use DateTimeInterface;
 use DateTimeZone;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Recur\EventIterator;

Spacing +5 added lines, -5 removed lines

@@ -245,8 +245,8 @@ 
                 // 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;
+                $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;
@@ -292,7 +292,7 @@ 
                 list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
                 if (
                     (is_null($higherStart) || $higherStart < $compStart) &&
-                    (is_null($higherEnd)   || $higherEnd > $compEnd)
+                    (is_null($higherEnd) || $higherEnd > $compEnd)
                 ) {
 
                     // Component is fully covered by a higher priority
@@ -424,7 +424,7 @@ 
 
                         if ($component->RRULE) {
                             try {
-                                $iterator = new EventIterator($object, (string)$component->UID, $this->timeZone);
+                                $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
@@ -464,7 +464,7 @@ 
                             if (isset($component->DTEND)) {
                                 $endTime = $component->DTEND->getDateTime($this->timeZone);
                             } elseif (isset($component->DURATION)) {
-                                $duration = DateTimeParser::parseDuration((string)$component->DURATION);
+                                $duration = DateTimeParser::parseDuration((string) $component->DURATION);
                                 $endTime = clone $startTime;
                                 $endTime = $endTime->add($duration);
                             } elseif (!$component->DTSTART->hasTime()) {

Braces +24 added lines, -9 removed lines

@@ -248,8 +248,12 @@ 
                 $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;
+                if ($priorityA === 0) {
+                	$priorityA = 10;
+                }
+                if ($priorityB === 0) {
+                	$priorityB = 10;
+                }
 
                 return $priorityA - $priorityB;
 
@@ -336,9 +340,11 @@ 
             );
 
             // Looping over the AVAILABLE components.
-            if (isset($vavail->AVAILABLE)) foreach ($vavail->AVAILABLE as $available) {
+            if (isset($vavail->AVAILABLE)) {
+            	foreach ($vavail->AVAILABLE as $available) {
 
                 list($availStart, $availEnd) = $available->getEffectiveStartEnd();
+            }
                 $fbData->add(
                     $availStart->getTimeStamp(),
                     $availEnd->getTimeStamp(),
@@ -481,8 +487,12 @@ 
 
                         foreach ($times as $time) {
 
-                            if ($this->end && $time[0] > $this->end) break;
-                            if ($this->start && $time[1] < $this->start) break;
+                            if ($this->end && $time[0] > $this->end) {
+                            	break;
+                            }
+                            if ($this->start && $time[1] < $this->start) {
+                            	break;
+                            }
 
                             $fbData->add(
                                 $time[0]->getTimeStamp(),
@@ -498,8 +508,9 @@ 
                             $fbType = isset($freebusy['FBTYPE']) ? strtoupper($freebusy['FBTYPE']) : 'BUSY';
 
                             // Skipping intervals marked as 'free'
-                            if ($fbType === 'FREE')
-                                continue;
+                            if ($fbType === 'FREE') {
+                                                            continue;
+                            }
 
                             $values = explode(',', $freebusy);
                             foreach ($values as $value) {
@@ -514,8 +525,12 @@ 
                                     $endTime = DateTimeParser::parseDateTime($endTime);
                                 }
 
-                                if ($this->start && $this->start > $endTime) continue;
-                                if ($this->end && $this->end < $startTime) continue;
+                                if ($this->start && $this->start > $endTime) {
+                                	continue;
+                                }
+                                if ($this->end && $this->end < $startTime) {
+                                	continue;
+                                }
                                 $fbData->add(
                                     $startTime->getTimeStamp(),
                                     $endTime->getTimeStamp(),

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,
-            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,
+			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/Parameter.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject;
 
-use Sabre\Xml;
 use ArrayIterator;
+use Sabre\Xml;
 
 /**
  * VObject Parameter.

Indentation +371 added lines, -371 removed lines

@@ -19,376 +19,376 @@
  */
 class Parameter extends Node {
 
-    /**
-     * Parameter name.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * vCard 2.1 allows parameters to be encoded without a name.
-     *
-     * We can deduce the parameter name based on it's value.
-     *
-     * @var bool
-     */
-    public $noName = false;
-
-    /**
-     * Parameter value.
-     *
-     * @var string
-     */
-    protected $value;
-
-    /**
-     * Sets up the object.
-     *
-     * It's recommended to use the create:: factory method instead.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __construct(Document $root, $name, $value = null) {
-
-        $this->name = strtoupper($name);
-        $this->root = $root;
-        if (is_null($name)) {
-            $this->noName = true;
-            $this->name = static::guessParameterNameByValue($value);
-        }
-
-        // If guessParameterNameByValue() returns an empty string
-        // above, we're actually dealing with a parameter that has no value.
-        // In that case we have to move the value to the name.
-        if ($this->name === '') {
-            $this->noName = false;
-            $this->name = strtoupper($value);
-        } else {
-            $this->setValue($value);
-        }
-
-    }
-
-    /**
-     * Try to guess property name by value, can be used for vCard 2.1 nameless parameters.
-     *
-     * Figuring out what the name should have been. Note that a ton of
-     * these are rather silly in 2014 and would probably rarely be
-     * used, but we like to be complete.
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    static function guessParameterNameByValue($value) {
-        switch (strtoupper($value)) {
-
-            // Encodings
-            case '7-BIT' :
-            case 'QUOTED-PRINTABLE' :
-            case 'BASE64' :
-                $name = 'ENCODING';
-                break;
-
-            // Common types
-            case 'WORK' :
-            case 'HOME' :
-            case 'PREF' :
-
-            // Delivery Label Type
-            case 'DOM' :
-            case 'INTL' :
-            case 'POSTAL' :
-            case 'PARCEL' :
-
-            // Telephone types
-            case 'VOICE' :
-            case 'FAX' :
-            case 'MSG' :
-            case 'CELL' :
-            case 'PAGER' :
-            case 'BBS' :
-            case 'MODEM' :
-            case 'CAR' :
-            case 'ISDN' :
-            case 'VIDEO' :
-
-            // EMAIL types (lol)
-            case 'AOL' :
-            case 'APPLELINK' :
-            case 'ATTMAIL' :
-            case 'CIS' :
-            case 'EWORLD' :
-            case 'INTERNET' :
-            case 'IBMMAIL' :
-            case 'MCIMAIL' :
-            case 'POWERSHARE' :
-            case 'PRODIGY' :
-            case 'TLX' :
-            case 'X400' :
-
-            // Photo / Logo format types
-            case 'GIF' :
-            case 'CGM' :
-            case 'WMF' :
-            case 'BMP' :
-            case 'DIB' :
-            case 'PICT' :
-            case 'TIFF' :
-            case 'PDF' :
-            case 'PS' :
-            case 'JPEG' :
-            case 'MPEG' :
-            case 'MPEG2' :
-            case 'AVI' :
-            case 'QTIME' :
-
-            // Sound Digital Audio Type
-            case 'WAVE' :
-            case 'PCM' :
-            case 'AIFF' :
-
-            // Key types
-            case 'X509' :
-            case 'PGP' :
-                $name = 'TYPE';
-                break;
-
-            // Value types
-            case 'INLINE' :
-            case 'URL' :
-            case 'CONTENT-ID' :
-            case 'CID' :
-                $name = 'VALUE';
-                break;
-
-            default:
-                $name = '';
-        }
-
-        return $name;
-    }
-
-    /**
-     * 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) {
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns the current value.
-     *
-     * This method will always return a string, or null. If there were multiple
-     * values, it will automatically concatenate them (separated by comma).
-     *
-     * @return string|null
-     */
-    public function getValue() {
-
-        if (is_array($this->value)) {
-            return implode(',', $this->value);
-        } else {
-            return $this->value;
-        }
-
-    }
-
-    /**
-     * Sets multiple values for this parameter.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setParts(array $value) {
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns all values for this parameter.
-     *
-     * If there were no values, an empty array will be returned.
-     *
-     * @return array
-     */
-    public function getParts() {
-
-        if (is_array($this->value)) {
-            return $this->value;
-        } elseif (is_null($this->value)) {
-            return [];
-        } else {
-            return [$this->value];
-        }
-
-    }
-
-    /**
-     * Adds a value to this parameter.
-     *
-     * If the argument is specified as an array, all items will be added to the
-     * parameter value list.
-     *
-     * @param string|array $part
-     *
-     * @return void
-     */
-    public function addValue($part) {
-
-        if (is_null($this->value)) {
-            $this->value = $part;
-        } else {
-            $this->value = array_merge((array)$this->value, (array)$part);
-        }
-
-    }
-
-    /**
-     * Checks if this parameter contains the specified value.
-     *
-     * This is a case-insensitive match. It makes sense to call this for for
-     * instance the TYPE parameter, to see if it contains a keyword such as
-     * 'WORK' or 'FAX'.
-     *
-     * @param string $value
-     *
-     * @return bool
-     */
-    public function has($value) {
-
-        return in_array(
-            strtolower($value),
-            array_map('strtolower', (array)$this->value)
-        );
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $value = $this->getParts();
-
-        if (count($value) === 0) {
-            return $this->name . '=';
-        }
-
-        if ($this->root->getDocumentType() === Document::VCARD21 && $this->noName) {
-
-            return implode(';', $value);
-
-        }
-
-        return $this->name . '=' . array_reduce(
-            $value,
-            function($out, $item) {
-
-                if (!is_null($out)) $out .= ',';
-
-                // If there's no special characters in the string, we'll use the simple
-                // format.
-                //
-                // The list of special characters is defined as:
-                //
-                // Any character except CONTROL, DQUOTE, ";", ":", ","
-                //
-                // by the iCalendar spec:
-                // https://tools.ietf.org/html/rfc5545#section-3.1
-                //
-                // And we add ^ to that because of:
-                // https://tools.ietf.org/html/rfc6868
-                //
-                // But we've found that iCal (7.0, shipped with OSX 10.9)
-                // severaly trips on + characters not being quoted, so we
-                // added + as well.
-                if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
-                    return $out . $item;
-                } else {
-                    // Enclosing in double-quotes, and using RFC6868 for encoding any
-                    // special characters
-                    $out .= '"' . strtr(
-                        $item,
-                        [
-                            '^'  => '^^',
-                            "\n" => '^n',
-                            '"'  => '^\'',
-                        ]
-                    ) . '"';
-                    return $out;
-                }
-
-            }
-        );
-
-    }
-
-    /**
-     * This method returns an array, with the representation as it should be
-     * encoded in JSON. This is used to create jCard or jCal documents.
-     *
-     * @return array
-     */
-    public function jsonSerialize() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * This method serializes the data into XML. This is used to create xCard or
-     * xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    public function xmlSerialize(Xml\Writer $writer) {
-
-        foreach (explode(',', $this->value) as $value) {
-            $writer->writeElement('text', $value);
-        }
-
-    }
-
-    /**
-     * Called when this object is being cast to a string.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return (string)$this->getValue();
-
-    }
-
-    /**
-     * Returns the iterator for this object.
-     *
-     * @return ElementList
-     */
-    public function getIterator() {
-
-        if (!is_null($this->iterator))
-            return $this->iterator;
-
-        return $this->iterator = new ArrayIterator((array)$this->value);
-
-    }
+	/**
+	 * Parameter name.
+	 *
+	 * @var string
+	 */
+	public $name;
+
+	/**
+	 * vCard 2.1 allows parameters to be encoded without a name.
+	 *
+	 * We can deduce the parameter name based on it's value.
+	 *
+	 * @var bool
+	 */
+	public $noName = false;
+
+	/**
+	 * Parameter value.
+	 *
+	 * @var string
+	 */
+	protected $value;
+
+	/**
+	 * Sets up the object.
+	 *
+	 * It's recommended to use the create:: factory method instead.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 */
+	public function __construct(Document $root, $name, $value = null) {
+
+		$this->name = strtoupper($name);
+		$this->root = $root;
+		if (is_null($name)) {
+			$this->noName = true;
+			$this->name = static::guessParameterNameByValue($value);
+		}
+
+		// If guessParameterNameByValue() returns an empty string
+		// above, we're actually dealing with a parameter that has no value.
+		// In that case we have to move the value to the name.
+		if ($this->name === '') {
+			$this->noName = false;
+			$this->name = strtoupper($value);
+		} else {
+			$this->setValue($value);
+		}
+
+	}
+
+	/**
+	 * Try to guess property name by value, can be used for vCard 2.1 nameless parameters.
+	 *
+	 * Figuring out what the name should have been. Note that a ton of
+	 * these are rather silly in 2014 and would probably rarely be
+	 * used, but we like to be complete.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	static function guessParameterNameByValue($value) {
+		switch (strtoupper($value)) {
+
+			// Encodings
+			case '7-BIT' :
+			case 'QUOTED-PRINTABLE' :
+			case 'BASE64' :
+				$name = 'ENCODING';
+				break;
+
+			// Common types
+			case 'WORK' :
+			case 'HOME' :
+			case 'PREF' :
+
+			// Delivery Label Type
+			case 'DOM' :
+			case 'INTL' :
+			case 'POSTAL' :
+			case 'PARCEL' :
+
+			// Telephone types
+			case 'VOICE' :
+			case 'FAX' :
+			case 'MSG' :
+			case 'CELL' :
+			case 'PAGER' :
+			case 'BBS' :
+			case 'MODEM' :
+			case 'CAR' :
+			case 'ISDN' :
+			case 'VIDEO' :
+
+			// EMAIL types (lol)
+			case 'AOL' :
+			case 'APPLELINK' :
+			case 'ATTMAIL' :
+			case 'CIS' :
+			case 'EWORLD' :
+			case 'INTERNET' :
+			case 'IBMMAIL' :
+			case 'MCIMAIL' :
+			case 'POWERSHARE' :
+			case 'PRODIGY' :
+			case 'TLX' :
+			case 'X400' :
+
+			// Photo / Logo format types
+			case 'GIF' :
+			case 'CGM' :
+			case 'WMF' :
+			case 'BMP' :
+			case 'DIB' :
+			case 'PICT' :
+			case 'TIFF' :
+			case 'PDF' :
+			case 'PS' :
+			case 'JPEG' :
+			case 'MPEG' :
+			case 'MPEG2' :
+			case 'AVI' :
+			case 'QTIME' :
+
+			// Sound Digital Audio Type
+			case 'WAVE' :
+			case 'PCM' :
+			case 'AIFF' :
+
+			// Key types
+			case 'X509' :
+			case 'PGP' :
+				$name = 'TYPE';
+				break;
+
+			// Value types
+			case 'INLINE' :
+			case 'URL' :
+			case 'CONTENT-ID' :
+			case 'CID' :
+				$name = 'VALUE';
+				break;
+
+			default:
+				$name = '';
+		}
+
+		return $name;
+	}
+
+	/**
+	 * 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) {
+
+		$this->value = $value;
+
+	}
+
+	/**
+	 * Returns the current value.
+	 *
+	 * This method will always return a string, or null. If there were multiple
+	 * values, it will automatically concatenate them (separated by comma).
+	 *
+	 * @return string|null
+	 */
+	public function getValue() {
+
+		if (is_array($this->value)) {
+			return implode(',', $this->value);
+		} else {
+			return $this->value;
+		}
+
+	}
+
+	/**
+	 * Sets multiple values for this parameter.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setParts(array $value) {
+
+		$this->value = $value;
+
+	}
+
+	/**
+	 * Returns all values for this parameter.
+	 *
+	 * If there were no values, an empty array will be returned.
+	 *
+	 * @return array
+	 */
+	public function getParts() {
+
+		if (is_array($this->value)) {
+			return $this->value;
+		} elseif (is_null($this->value)) {
+			return [];
+		} else {
+			return [$this->value];
+		}
+
+	}
+
+	/**
+	 * Adds a value to this parameter.
+	 *
+	 * If the argument is specified as an array, all items will be added to the
+	 * parameter value list.
+	 *
+	 * @param string|array $part
+	 *
+	 * @return void
+	 */
+	public function addValue($part) {
+
+		if (is_null($this->value)) {
+			$this->value = $part;
+		} else {
+			$this->value = array_merge((array)$this->value, (array)$part);
+		}
+
+	}
+
+	/**
+	 * Checks if this parameter contains the specified value.
+	 *
+	 * This is a case-insensitive match. It makes sense to call this for for
+	 * instance the TYPE parameter, to see if it contains a keyword such as
+	 * 'WORK' or 'FAX'.
+	 *
+	 * @param string $value
+	 *
+	 * @return bool
+	 */
+	public function has($value) {
+
+		return in_array(
+			strtolower($value),
+			array_map('strtolower', (array)$this->value)
+		);
+
+	}
+
+	/**
+	 * Turns the object back into a serialized blob.
+	 *
+	 * @return string
+	 */
+	public function serialize() {
+
+		$value = $this->getParts();
+
+		if (count($value) === 0) {
+			return $this->name . '=';
+		}
+
+		if ($this->root->getDocumentType() === Document::VCARD21 && $this->noName) {
+
+			return implode(';', $value);
+
+		}
+
+		return $this->name . '=' . array_reduce(
+			$value,
+			function($out, $item) {
+
+				if (!is_null($out)) $out .= ',';
+
+				// If there's no special characters in the string, we'll use the simple
+				// format.
+				//
+				// The list of special characters is defined as:
+				//
+				// Any character except CONTROL, DQUOTE, ";", ":", ","
+				//
+				// by the iCalendar spec:
+				// https://tools.ietf.org/html/rfc5545#section-3.1
+				//
+				// And we add ^ to that because of:
+				// https://tools.ietf.org/html/rfc6868
+				//
+				// But we've found that iCal (7.0, shipped with OSX 10.9)
+				// severaly trips on + characters not being quoted, so we
+				// added + as well.
+				if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
+					return $out . $item;
+				} else {
+					// Enclosing in double-quotes, and using RFC6868 for encoding any
+					// special characters
+					$out .= '"' . strtr(
+						$item,
+						[
+							'^'  => '^^',
+							"\n" => '^n',
+							'"'  => '^\'',
+						]
+					) . '"';
+					return $out;
+				}
+
+			}
+		);
+
+	}
+
+	/**
+	 * This method returns an array, with the representation as it should be
+	 * encoded in JSON. This is used to create jCard or jCal documents.
+	 *
+	 * @return array
+	 */
+	public function jsonSerialize() {
+
+		return $this->value;
+
+	}
+
+	/**
+	 * This method serializes the data into XML. This is used to create xCard or
+	 * xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	public function xmlSerialize(Xml\Writer $writer) {
+
+		foreach (explode(',', $this->value) as $value) {
+			$writer->writeElement('text', $value);
+		}
+
+	}
+
+	/**
+	 * Called when this object is being cast to a string.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+
+		return (string)$this->getValue();
+
+	}
+
+	/**
+	 * Returns the iterator for this object.
+	 *
+	 * @return ElementList
+	 */
+	public function getIterator() {
+
+		if (!is_null($this->iterator))
+			return $this->iterator;
+
+		return $this->iterator = new ArrayIterator((array)$this->value);
+
+	}
 
 }

Doc Comments +2 added lines, -2 removed lines

@@ -176,7 +176,7 @@ 
      *
      * This may be either a single, or multiple strings in an array.
      *
-     * @param string|array $value
+     * @param string|null $value
      *
      * @return void
      */
@@ -342,7 +342,7 @@ 
      * This method returns an array, with the representation as it should be
      * encoded in JSON. This is used to create jCard or jCal documents.
      *
-     * @return array
+     * @return string
      */
     public function jsonSerialize() {
 

Spacing +4 added lines, -4 removed lines

@@ -251,7 +251,7 @@ 
         if (is_null($this->value)) {
             $this->value = $part;
         } else {
-            $this->value = array_merge((array)$this->value, (array)$part);
+            $this->value = array_merge((array) $this->value, (array) $part);
         }
 
     }
@@ -271,7 +271,7 @@ 
 
         return in_array(
             strtolower($value),
-            array_map('strtolower', (array)$this->value)
+            array_map('strtolower', (array) $this->value)
         );
 
     }
@@ -373,7 +373,7 @@ 
      */
     public function __toString() {
 
-        return (string)$this->getValue();
+        return (string) $this->getValue();
 
     }
 
@@ -387,7 +387,7 @@ 
         if (!is_null($this->iterator))
             return $this->iterator;
 
-        return $this->iterator = new ArrayIterator((array)$this->value);
+        return $this->iterator = new ArrayIterator((array) $this->value);
 
     }
 

Braces +6 added lines, -3 removed lines

@@ -299,7 +299,9 @@ 
             $value,
             function($out, $item) {
 
-                if (!is_null($out)) $out .= ',';
+                if (!is_null($out)) {
+                	$out .= ',';
+                }
 
                 // If there's no special characters in the string, we'll use the simple
                 // format.
@@ -384,8 +386,9 @@ 
      */
     public function getIterator() {
 
-        if (!is_null($this->iterator))
-            return $this->iterator;
+        if (!is_null($this->iterator)) {
+                    return $this->iterator;
+        }
 
         return $this->iterator = new ArrayIterator((array)$this->value);
 

libraries/SabreDAV/VObject/Parser/Json.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -4,8 +4,8 @@
 
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
-use Sabre\VObject\ParseException;
 use Sabre\VObject\EofException;
+use Sabre\VObject\ParseException;
 
 /**
  * Json Parser.

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
         // value type. We're using this value later in this function.
         $defaultPropertyClass = $this->root->getClassNameForPropertyName($propertyName);
 
-        $parameters = (array)$parameters;
+        $parameters = (array) $parameters;
 
         $value = array_slice($jProp, 3);
 

Braces +6 added lines, -2 removed lines

@@ -72,9 +72,11 @@ 
         foreach ($this->input[1] as $prop) {
             $this->root->add($this->parseProperty($prop));
         }
-        if (isset($this->input[2])) foreach ($this->input[2] as $comp) {
+        if (isset($this->input[2])) {
+        	foreach ($this->input[2] as $comp) {
             $this->root->add($this->parseComponent($comp));
         }
+        }
 
         // Resetting the input so we can throw an feof exception the next time.
         $this->input = null;
@@ -111,7 +113,9 @@ 
                 $jComp[2]
             );
 
-        } else $components = [];
+        } else {
+        	$components = [];
+        }
 
         return $this->root->createComponent(
             $jComp[0],

Indentation +175 added lines, -175 removed lines

@@ -18,180 +18,180 @@
  */
 class Json extends Parser {
 
-    /**
-     * The input data.
-     *
-     * @var array
-     */
-    protected $input;
-
-    /**
-     * Root component.
-     *
-     * @var Document
-     */
-    protected $root;
-
-    /**
-     * This method starts the parsing process.
-     *
-     * If the input was not supplied during construction, it's possible to pass
-     * it here instead.
-     *
-     * If either input or options are not supplied, the defaults will be used.
-     *
-     * @param resource|string|array|null $input
-     * @param int $options
-     *
-     * @return Sabre\VObject\Document
-     */
-    public function parse($input = null, $options = 0) {
-
-        if (!is_null($input)) {
-            $this->setInput($input);
-        }
-        if (is_null($this->input)) {
-            throw new EofException('End of input stream, or no input supplied');
-        }
-
-        if (0 !== $options) {
-            $this->options = $options;
-        }
-
-        switch ($this->input[0]) {
-            case 'vcalendar' :
-                $this->root = new VCalendar([], false);
-                break;
-            case 'vcard' :
-                $this->root = new VCard([], false);
-                break;
-            default :
-                throw new ParseException('The root component must either be a vcalendar, or a vcard');
-
-        }
-        foreach ($this->input[1] as $prop) {
-            $this->root->add($this->parseProperty($prop));
-        }
-        if (isset($this->input[2])) foreach ($this->input[2] as $comp) {
-            $this->root->add($this->parseComponent($comp));
-        }
-
-        // Resetting the input so we can throw an feof exception the next time.
-        $this->input = null;
-
-        return $this->root;
-
-    }
-
-    /**
-     * Parses a component.
-     *
-     * @param array $jComp
-     *
-     * @return \Sabre\VObject\Component
-     */
-    public function parseComponent(array $jComp) {
-
-        // We can remove $self from PHP 5.4 onward.
-        $self = $this;
-
-        $properties = array_map(
-            function($jProp) use ($self) {
-                return $self->parseProperty($jProp);
-            },
-            $jComp[1]
-        );
-
-        if (isset($jComp[2])) {
-
-            $components = array_map(
-                function($jComp) use ($self) {
-                    return $self->parseComponent($jComp);
-                },
-                $jComp[2]
-            );
-
-        } else $components = [];
-
-        return $this->root->createComponent(
-            $jComp[0],
-            array_merge($properties, $components),
-            $defaults = false
-        );
-
-    }
-
-    /**
-     * Parses properties.
-     *
-     * @param array $jProp
-     *
-     * @return \Sabre\VObject\Property
-     */
-    public function parseProperty(array $jProp) {
-
-        list(
-            $propertyName,
-            $parameters,
-            $valueType
-        ) = $jProp;
-
-        $propertyName = strtoupper($propertyName);
-
-        // This is the default class we would be using if we didn't know the
-        // value type. We're using this value later in this function.
-        $defaultPropertyClass = $this->root->getClassNameForPropertyName($propertyName);
-
-        $parameters = (array)$parameters;
-
-        $value = array_slice($jProp, 3);
-
-        $valueType = strtoupper($valueType);
-
-        if (isset($parameters['group'])) {
-            $propertyName = $parameters['group'] . '.' . $propertyName;
-            unset($parameters['group']);
-        }
-
-        $prop = $this->root->createProperty($propertyName, null, $parameters, $valueType);
-        $prop->setJsonValue($value);
-
-        // We have to do something awkward here. FlatText as well as Text
-        // represents TEXT values. We have to normalize these here. In the
-        // future we can get rid of FlatText once we're allowed to break BC
-        // again.
-        if ($defaultPropertyClass === 'Sabre\VObject\Property\FlatText') {
-            $defaultPropertyClass = 'Sabre\VObject\Property\Text';
-        }
-
-        // If the value type we received (e.g.: TEXT) was not the default value
-        // type for the given property (e.g.: BDAY), we need to add a VALUE=
-        // parameter.
-        if ($defaultPropertyClass !== get_class($prop)) {
-            $prop["VALUE"] = $valueType;
-        }
-
-        return $prop;
-
-    }
-
-    /**
-     * Sets the input data.
-     *
-     * @param resource|string|array $input
-     *
-     * @return void
-     */
-    public function setInput($input) {
-
-        if (is_resource($input)) {
-            $input = stream_get_contents($input);
-        }
-        if (is_string($input)) {
-            $input = json_decode($input);
-        }
-        $this->input = $input;
-
-    }
+	/**
+	 * The input data.
+	 *
+	 * @var array
+	 */
+	protected $input;
+
+	/**
+	 * Root component.
+	 *
+	 * @var Document
+	 */
+	protected $root;
+
+	/**
+	 * This method starts the parsing process.
+	 *
+	 * If the input was not supplied during construction, it's possible to pass
+	 * it here instead.
+	 *
+	 * If either input or options are not supplied, the defaults will be used.
+	 *
+	 * @param resource|string|array|null $input
+	 * @param int $options
+	 *
+	 * @return Sabre\VObject\Document
+	 */
+	public function parse($input = null, $options = 0) {
+
+		if (!is_null($input)) {
+			$this->setInput($input);
+		}
+		if (is_null($this->input)) {
+			throw new EofException('End of input stream, or no input supplied');
+		}
+
+		if (0 !== $options) {
+			$this->options = $options;
+		}
+
+		switch ($this->input[0]) {
+			case 'vcalendar' :
+				$this->root = new VCalendar([], false);
+				break;
+			case 'vcard' :
+				$this->root = new VCard([], false);
+				break;
+			default :
+				throw new ParseException('The root component must either be a vcalendar, or a vcard');
+
+		}
+		foreach ($this->input[1] as $prop) {
+			$this->root->add($this->parseProperty($prop));
+		}
+		if (isset($this->input[2])) foreach ($this->input[2] as $comp) {
+			$this->root->add($this->parseComponent($comp));
+		}
+
+		// Resetting the input so we can throw an feof exception the next time.
+		$this->input = null;
+
+		return $this->root;
+
+	}
+
+	/**
+	 * Parses a component.
+	 *
+	 * @param array $jComp
+	 *
+	 * @return \Sabre\VObject\Component
+	 */
+	public function parseComponent(array $jComp) {
+
+		// We can remove $self from PHP 5.4 onward.
+		$self = $this;
+
+		$properties = array_map(
+			function($jProp) use ($self) {
+				return $self->parseProperty($jProp);
+			},
+			$jComp[1]
+		);
+
+		if (isset($jComp[2])) {
+
+			$components = array_map(
+				function($jComp) use ($self) {
+					return $self->parseComponent($jComp);
+				},
+				$jComp[2]
+			);
+
+		} else $components = [];
+
+		return $this->root->createComponent(
+			$jComp[0],
+			array_merge($properties, $components),
+			$defaults = false
+		);
+
+	}
+
+	/**
+	 * Parses properties.
+	 *
+	 * @param array $jProp
+	 *
+	 * @return \Sabre\VObject\Property
+	 */
+	public function parseProperty(array $jProp) {
+
+		list(
+			$propertyName,
+			$parameters,
+			$valueType
+		) = $jProp;
+
+		$propertyName = strtoupper($propertyName);
+
+		// This is the default class we would be using if we didn't know the
+		// value type. We're using this value later in this function.
+		$defaultPropertyClass = $this->root->getClassNameForPropertyName($propertyName);
+
+		$parameters = (array)$parameters;
+
+		$value = array_slice($jProp, 3);
+
+		$valueType = strtoupper($valueType);
+
+		if (isset($parameters['group'])) {
+			$propertyName = $parameters['group'] . '.' . $propertyName;
+			unset($parameters['group']);
+		}
+
+		$prop = $this->root->createProperty($propertyName, null, $parameters, $valueType);
+		$prop->setJsonValue($value);
+
+		// We have to do something awkward here. FlatText as well as Text
+		// represents TEXT values. We have to normalize these here. In the
+		// future we can get rid of FlatText once we're allowed to break BC
+		// again.
+		if ($defaultPropertyClass === 'Sabre\VObject\Property\FlatText') {
+			$defaultPropertyClass = 'Sabre\VObject\Property\Text';
+		}
+
+		// If the value type we received (e.g.: TEXT) was not the default value
+		// type for the given property (e.g.: BDAY), we need to add a VALUE=
+		// parameter.
+		if ($defaultPropertyClass !== get_class($prop)) {
+			$prop["VALUE"] = $valueType;
+		}
+
+		return $prop;
+
+	}
+
+	/**
+	 * Sets the input data.
+	 *
+	 * @param resource|string|array $input
+	 *
+	 * @return void
+	 */
+	public function setInput($input) {
+
+		if (is_resource($input)) {
+			$input = stream_get_contents($input);
+		}
+		if (is_string($input)) {
+			$input = json_decode($input);
+		}
+		$this->input = $input;
+
+	}
 
 }

libraries/SabreDAV/VObject/Parser/MimeDir.php

Doc Comments +2 added lines, -1 removed lines

@@ -331,6 +331,7 @@ 
     /**
      * Reads a property or component from a line.
      *
+     * @param string $line
      * @return void
      */
     protected function readProperty($line) {
@@ -623,7 +624,7 @@ 
      *
      * @param string $input
      *
-     * @return void
+     * @return string
      */
     private function unescapeParam($input) {
 

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,12 +2,12 @@
 
 namespace Sabre\VObject\Parser;
 
-use Sabre\VObject\ParseException;
-use Sabre\VObject\EofException;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Document;
+use Sabre\VObject\EofException;
+use Sabre\VObject\ParseException;
 
 /**
  * MimeDir parser.

Indentation +645 added lines, -645 removed lines

@@ -24,328 +24,328 @@ 
  */
 class MimeDir extends Parser {
 
-    /**
-     * The input stream.
-     *
-     * @var resource
-     */
-    protected $input;
-
-    /**
-     * Root component.
-     *
-     * @var Component
-     */
-    protected $root;
-
-    /**
-     * By default all input will be assumed to be UTF-8.
-     *
-     * However, both iCalendar and vCard might be encoded using different
-     * character sets. The character set is usually set in the mime-type.
-     *
-     * If this is the case, use setEncoding to specify that a different
-     * encoding will be used. If this is set, the parser will automatically
-     * convert all incoming data to UTF-8.
-     *
-     * @var string
-     */
-    protected $charset = 'UTF-8';
-
-    /**
-     * The list of character sets we support when decoding.
-     *
-     * This would be a const expression but for now we need to support PHP 5.5
-     */
-    protected static $SUPPORTED_CHARSETS = [
-        'UTF-8',
-        'ISO-8859-1',
-        'Windows-1252',
-    ];
-
-    /**
-     * Parses an iCalendar or vCard file.
-     *
-     * Pass a stream or a string. If null is parsed, the existing buffer is
-     * used.
-     *
-     * @param string|resource|null $input
-     * @param int $options
-     *
-     * @return Sabre\VObject\Document
-     */
-    public function parse($input = null, $options = 0) {
-
-        $this->root = null;
-
-        if (!is_null($input)) {
-            $this->setInput($input);
-        }
-
-        if (0 !== $options) {
-            $this->options = $options;
-        }
-
-        $this->parseDocument();
-
-        return $this->root;
-
-    }
-
-    /**
-     * By default all input will be assumed to be UTF-8.
-     *
-     * However, both iCalendar and vCard might be encoded using different
-     * character sets. The character set is usually set in the mime-type.
-     *
-     * If this is the case, use setEncoding to specify that a different
-     * encoding will be used. If this is set, the parser will automatically
-     * convert all incoming data to UTF-8.
-     *
-     * @param string $charset
-     */
-    public function setCharset($charset) {
-
-        if (!in_array($charset, self::$SUPPORTED_CHARSETS)) {
-            throw new \InvalidArgumentException('Unsupported encoding. (Supported encodings: ' . implode(', ', self::$SUPPORTED_CHARSETS) . ')');
-        }
-        $this->charset = $charset;
-
-    }
-
-    /**
-     * Sets the input buffer. Must be a string or stream.
-     *
-     * @param resource|string $input
-     *
-     * @return void
-     */
-    public function setInput($input) {
-
-        // Resetting the parser
-        $this->lineIndex = 0;
-        $this->startLine = 0;
-
-        if (is_string($input)) {
-            // Convering to a stream.
-            $stream = fopen('php://temp', 'r+');
-            fwrite($stream, $input);
-            rewind($stream);
-            $this->input = $stream;
-        } elseif (is_resource($input)) {
-            $this->input = $input;
-        } else {
-            throw new \InvalidArgumentException('This parser can only read from strings or streams.');
-        }
-
-    }
-
-    /**
-     * Parses an entire document.
-     *
-     * @return void
-     */
-    protected function parseDocument() {
-
-        $line = $this->readLine();
-
-        // BOM is ZERO WIDTH NO-BREAK SPACE (U+FEFF).
-        // It's 0xEF 0xBB 0xBF in UTF-8 hex.
-        if (3 <= strlen($line)
-            && ord($line[0]) === 0xef
-            && ord($line[1]) === 0xbb
-            && ord($line[2]) === 0xbf) {
-            $line = substr($line, 3);
-        }
-
-        switch (strtoupper($line)) {
-            case 'BEGIN:VCALENDAR' :
-                $class = VCalendar::$componentMap['VCALENDAR'];
-                break;
-            case 'BEGIN:VCARD' :
-                $class = VCard::$componentMap['VCARD'];
-                break;
-            default :
-                throw new ParseException('This parser only supports VCARD and VCALENDAR files');
-        }
-
-        $this->root = new $class([], false);
-
-        while (true) {
-
-            // Reading until we hit END:
-            $line = $this->readLine();
-            if (strtoupper(substr($line, 0, 4)) === 'END:') {
-                break;
-            }
-            $result = $this->parseLine($line);
-            if ($result) {
-                $this->root->add($result);
-            }
-
-        }
-
-        $name = strtoupper(substr($line, 4));
-        if ($name !== $this->root->name) {
-            throw new ParseException('Invalid MimeDir file. expected: "END:' . $this->root->name . '" got: "END:' . $name . '"');
-        }
-
-    }
-
-    /**
-     * Parses a line, and if it hits a component, it will also attempt to parse
-     * the entire component.
-     *
-     * @param string $line Unfolded line
-     *
-     * @return Node
-     */
-    protected function parseLine($line) {
-
-        // Start of a new component
-        if (strtoupper(substr($line, 0, 6)) === 'BEGIN:') {
-
-            $component = $this->root->createComponent(substr($line, 6), [], false);
-
-            while (true) {
-
-                // Reading until we hit END:
-                $line = $this->readLine();
-                if (strtoupper(substr($line, 0, 4)) === 'END:') {
-                    break;
-                }
-                $result = $this->parseLine($line);
-                if ($result) {
-                    $component->add($result);
-                }
-
-            }
-
-            $name = strtoupper(substr($line, 4));
-            if ($name !== $component->name) {
-                throw new ParseException('Invalid MimeDir file. expected: "END:' . $component->name . '" got: "END:' . $name . '"');
-            }
-
-            return $component;
-
-        } else {
-
-            // Property reader
-            $property = $this->readProperty($line);
-            if (!$property) {
-                // Ignored line
-                return false;
-            }
-            return $property;
-
-        }
-
-    }
-
-    /**
-     * We need to look ahead 1 line every time to see if we need to 'unfold'
-     * the next line.
-     *
-     * If that was not the case, we store it here.
-     *
-     * @var null|string
-     */
-    protected $lineBuffer;
-
-    /**
-     * The real current line number.
-     */
-    protected $lineIndex = 0;
-
-    /**
-     * In the case of unfolded lines, this property holds the line number for
-     * the start of the line.
-     *
-     * @var int
-     */
-    protected $startLine = 0;
-
-    /**
-     * Contains a 'raw' representation of the current line.
-     *
-     * @var string
-     */
-    protected $rawLine;
-
-    /**
-     * Reads a single line from the buffer.
-     *
-     * This method strips any newlines and also takes care of unfolding.
-     *
-     * @throws \Sabre\VObject\EofException
-     *
-     * @return string
-     */
-    protected function readLine() {
-
-        if (!is_null($this->lineBuffer)) {
-            $rawLine = $this->lineBuffer;
-            $this->lineBuffer = null;
-        } else {
-            do {
-                $eof = feof($this->input);
-
-                $rawLine = fgets($this->input);
-
-                if ($eof || (feof($this->input) && $rawLine === false)) {
-                    throw new EofException('End of document reached prematurely');
-                }
-                if ($rawLine === false) {
-                    throw new ParseException('Error reading from input stream');
-                }
-                $rawLine = rtrim($rawLine, "\r\n");
-            } while ($rawLine === ''); // Skipping empty lines
-            $this->lineIndex++;
-        }
-        $line = $rawLine;
-
-        $this->startLine = $this->lineIndex;
-
-        // Looking ahead for folded lines.
-        while (true) {
-
-            $nextLine = rtrim(fgets($this->input), "\r\n");
-            $this->lineIndex++;
-            if (!$nextLine) {
-                break;
-            }
-            if ($nextLine[0] === "\t" || $nextLine[0] === " ") {
-                $line .= substr($nextLine, 1);
-                $rawLine .= "\n " . substr($nextLine, 1);
-            } else {
-                $this->lineBuffer = $nextLine;
-                break;
-            }
-
-        }
-        $this->rawLine = $rawLine;
-        return $line;
-
-    }
-
-    /**
-     * Reads a property or component from a line.
-     *
-     * @return void
-     */
-    protected function readProperty($line) {
-
-        if ($this->options & self::OPTION_FORGIVING) {
-            $propNameToken = 'A-Z0-9\-\._\\/';
-        } else {
-            $propNameToken = 'A-Z0-9\-\.';
-        }
-
-        $paramNameToken = 'A-Z0-9\-';
-        $safeChar = '^";:,';
-        $qSafeChar = '^"';
-
-        $regex = "/
+	/**
+	 * The input stream.
+	 *
+	 * @var resource
+	 */
+	protected $input;
+
+	/**
+	 * Root component.
+	 *
+	 * @var Component
+	 */
+	protected $root;
+
+	/**
+	 * By default all input will be assumed to be UTF-8.
+	 *
+	 * However, both iCalendar and vCard might be encoded using different
+	 * character sets. The character set is usually set in the mime-type.
+	 *
+	 * If this is the case, use setEncoding to specify that a different
+	 * encoding will be used. If this is set, the parser will automatically
+	 * convert all incoming data to UTF-8.
+	 *
+	 * @var string
+	 */
+	protected $charset = 'UTF-8';
+
+	/**
+	 * The list of character sets we support when decoding.
+	 *
+	 * This would be a const expression but for now we need to support PHP 5.5
+	 */
+	protected static $SUPPORTED_CHARSETS = [
+		'UTF-8',
+		'ISO-8859-1',
+		'Windows-1252',
+	];
+
+	/**
+	 * Parses an iCalendar or vCard file.
+	 *
+	 * Pass a stream or a string. If null is parsed, the existing buffer is
+	 * used.
+	 *
+	 * @param string|resource|null $input
+	 * @param int $options
+	 *
+	 * @return Sabre\VObject\Document
+	 */
+	public function parse($input = null, $options = 0) {
+
+		$this->root = null;
+
+		if (!is_null($input)) {
+			$this->setInput($input);
+		}
+
+		if (0 !== $options) {
+			$this->options = $options;
+		}
+
+		$this->parseDocument();
+
+		return $this->root;
+
+	}
+
+	/**
+	 * By default all input will be assumed to be UTF-8.
+	 *
+	 * However, both iCalendar and vCard might be encoded using different
+	 * character sets. The character set is usually set in the mime-type.
+	 *
+	 * If this is the case, use setEncoding to specify that a different
+	 * encoding will be used. If this is set, the parser will automatically
+	 * convert all incoming data to UTF-8.
+	 *
+	 * @param string $charset
+	 */
+	public function setCharset($charset) {
+
+		if (!in_array($charset, self::$SUPPORTED_CHARSETS)) {
+			throw new \InvalidArgumentException('Unsupported encoding. (Supported encodings: ' . implode(', ', self::$SUPPORTED_CHARSETS) . ')');
+		}
+		$this->charset = $charset;
+
+	}
+
+	/**
+	 * Sets the input buffer. Must be a string or stream.
+	 *
+	 * @param resource|string $input
+	 *
+	 * @return void
+	 */
+	public function setInput($input) {
+
+		// Resetting the parser
+		$this->lineIndex = 0;
+		$this->startLine = 0;
+
+		if (is_string($input)) {
+			// Convering to a stream.
+			$stream = fopen('php://temp', 'r+');
+			fwrite($stream, $input);
+			rewind($stream);
+			$this->input = $stream;
+		} elseif (is_resource($input)) {
+			$this->input = $input;
+		} else {
+			throw new \InvalidArgumentException('This parser can only read from strings or streams.');
+		}
+
+	}
+
+	/**
+	 * Parses an entire document.
+	 *
+	 * @return void
+	 */
+	protected function parseDocument() {
+
+		$line = $this->readLine();
+
+		// BOM is ZERO WIDTH NO-BREAK SPACE (U+FEFF).
+		// It's 0xEF 0xBB 0xBF in UTF-8 hex.
+		if (3 <= strlen($line)
+			&& ord($line[0]) === 0xef
+			&& ord($line[1]) === 0xbb
+			&& ord($line[2]) === 0xbf) {
+			$line = substr($line, 3);
+		}
+
+		switch (strtoupper($line)) {
+			case 'BEGIN:VCALENDAR' :
+				$class = VCalendar::$componentMap['VCALENDAR'];
+				break;
+			case 'BEGIN:VCARD' :
+				$class = VCard::$componentMap['VCARD'];
+				break;
+			default :
+				throw new ParseException('This parser only supports VCARD and VCALENDAR files');
+		}
+
+		$this->root = new $class([], false);
+
+		while (true) {
+
+			// Reading until we hit END:
+			$line = $this->readLine();
+			if (strtoupper(substr($line, 0, 4)) === 'END:') {
+				break;
+			}
+			$result = $this->parseLine($line);
+			if ($result) {
+				$this->root->add($result);
+			}
+
+		}
+
+		$name = strtoupper(substr($line, 4));
+		if ($name !== $this->root->name) {
+			throw new ParseException('Invalid MimeDir file. expected: "END:' . $this->root->name . '" got: "END:' . $name . '"');
+		}
+
+	}
+
+	/**
+	 * Parses a line, and if it hits a component, it will also attempt to parse
+	 * the entire component.
+	 *
+	 * @param string $line Unfolded line
+	 *
+	 * @return Node
+	 */
+	protected function parseLine($line) {
+
+		// Start of a new component
+		if (strtoupper(substr($line, 0, 6)) === 'BEGIN:') {
+
+			$component = $this->root->createComponent(substr($line, 6), [], false);
+
+			while (true) {
+
+				// Reading until we hit END:
+				$line = $this->readLine();
+				if (strtoupper(substr($line, 0, 4)) === 'END:') {
+					break;
+				}
+				$result = $this->parseLine($line);
+				if ($result) {
+					$component->add($result);
+				}
+
+			}
+
+			$name = strtoupper(substr($line, 4));
+			if ($name !== $component->name) {
+				throw new ParseException('Invalid MimeDir file. expected: "END:' . $component->name . '" got: "END:' . $name . '"');
+			}
+
+			return $component;
+
+		} else {
+
+			// Property reader
+			$property = $this->readProperty($line);
+			if (!$property) {
+				// Ignored line
+				return false;
+			}
+			return $property;
+
+		}
+
+	}
+
+	/**
+	 * We need to look ahead 1 line every time to see if we need to 'unfold'
+	 * the next line.
+	 *
+	 * If that was not the case, we store it here.
+	 *
+	 * @var null|string
+	 */
+	protected $lineBuffer;
+
+	/**
+	 * The real current line number.
+	 */
+	protected $lineIndex = 0;
+
+	/**
+	 * In the case of unfolded lines, this property holds the line number for
+	 * the start of the line.
+	 *
+	 * @var int
+	 */
+	protected $startLine = 0;
+
+	/**
+	 * Contains a 'raw' representation of the current line.
+	 *
+	 * @var string
+	 */
+	protected $rawLine;
+
+	/**
+	 * Reads a single line from the buffer.
+	 *
+	 * This method strips any newlines and also takes care of unfolding.
+	 *
+	 * @throws \Sabre\VObject\EofException
+	 *
+	 * @return string
+	 */
+	protected function readLine() {
+
+		if (!is_null($this->lineBuffer)) {
+			$rawLine = $this->lineBuffer;
+			$this->lineBuffer = null;
+		} else {
+			do {
+				$eof = feof($this->input);
+
+				$rawLine = fgets($this->input);
+
+				if ($eof || (feof($this->input) && $rawLine === false)) {
+					throw new EofException('End of document reached prematurely');
+				}
+				if ($rawLine === false) {
+					throw new ParseException('Error reading from input stream');
+				}
+				$rawLine = rtrim($rawLine, "\r\n");
+			} while ($rawLine === ''); // Skipping empty lines
+			$this->lineIndex++;
+		}
+		$line = $rawLine;
+
+		$this->startLine = $this->lineIndex;
+
+		// Looking ahead for folded lines.
+		while (true) {
+
+			$nextLine = rtrim(fgets($this->input), "\r\n");
+			$this->lineIndex++;
+			if (!$nextLine) {
+				break;
+			}
+			if ($nextLine[0] === "\t" || $nextLine[0] === " ") {
+				$line .= substr($nextLine, 1);
+				$rawLine .= "\n " . substr($nextLine, 1);
+			} else {
+				$this->lineBuffer = $nextLine;
+				break;
+			}
+
+		}
+		$this->rawLine = $rawLine;
+		return $line;
+
+	}
+
+	/**
+	 * Reads a property or component from a line.
+	 *
+	 * @return void
+	 */
+	protected function readProperty($line) {
+
+		if ($this->options & self::OPTION_FORGIVING) {
+			$propNameToken = 'A-Z0-9\-\._\\/';
+		} else {
+			$propNameToken = 'A-Z0-9\-\.';
+		}
+
+		$paramNameToken = 'A-Z0-9\-';
+		$safeChar = '^";:,';
+		$qSafeChar = '^"';
+
+		$regex = "/
             ^(?P<name> [$propNameToken]+ ) (?=[;:])        # property name
             |
             (?<=:)(?P<propValue> .+)$                      # property value
@@ -358,338 +358,338 @@ 
             ) (?=[;:,])
             /xi";
 
-        preg_match_all($regex, $line, $matches,  PREG_SET_ORDER);
-
-        $property = [
-            'name'       => null,
-            'parameters' => [],
-            'value'      => null
-        ];
-
-        $lastParam = null;
-
-        /**
-         * Looping through all the tokens.
-         *
-         * Note that we are looping through them in reverse order, because if a
-         * sub-pattern matched, the subsequent named patterns will not show up
-         * in the result.
-         */
-        foreach ($matches as $match) {
-
-            if (isset($match['paramValue'])) {
-                if ($match['paramValue'] && $match['paramValue'][0] === '"') {
-                    $value = substr($match['paramValue'], 1, -1);
-                } else {
-                    $value = $match['paramValue'];
-                }
-
-                $value = $this->unescapeParam($value);
-
-                if (is_null($lastParam)) {
-                    throw new ParseException('Invalid Mimedir file. Line starting at ' . $this->startLine . ' did not follow iCalendar/vCard conventions');
-                }
-                if (is_null($property['parameters'][$lastParam])) {
-                    $property['parameters'][$lastParam] = $value;
-                } elseif (is_array($property['parameters'][$lastParam])) {
-                    $property['parameters'][$lastParam][] = $value;
-                } else {
-                    $property['parameters'][$lastParam] = [
-                        $property['parameters'][$lastParam],
-                        $value
-                    ];
-                }
-                continue;
-            }
-            if (isset($match['paramName'])) {
-                $lastParam = strtoupper($match['paramName']);
-                if (!isset($property['parameters'][$lastParam])) {
-                    $property['parameters'][$lastParam] = null;
-                }
-                continue;
-            }
-            if (isset($match['propValue'])) {
-                $property['value'] = $match['propValue'];
-                continue;
-            }
-            if (isset($match['name']) && $match['name']) {
-                $property['name'] = strtoupper($match['name']);
-                continue;
-            }
-
-            // @codeCoverageIgnoreStart
-            throw new \LogicException('This code should not be reachable');
-            // @codeCoverageIgnoreEnd
-
-        }
-
-        if (is_null($property['value'])) {
-            $property['value'] = '';
-        }
-        if (!$property['name']) {
-            if ($this->options & self::OPTION_IGNORE_INVALID_LINES) {
-                return false;
-            }
-            throw new ParseException('Invalid Mimedir file. Line starting at ' . $this->startLine . ' did not follow iCalendar/vCard conventions');
-        }
-
-        // vCard 2.1 states that parameters may appear without a name, and only
-        // a value. We can deduce the value based on it's name.
-        //
-        // Our parser will get those as parameters without a value instead, so
-        // we're filtering these parameters out first.
-        $namedParameters = [];
-        $namelessParameters = [];
-
-        foreach ($property['parameters'] as $name => $value) {
-            if (!is_null($value)) {
-                $namedParameters[$name] = $value;
-            } else {
-                $namelessParameters[] = $name;
-            }
-        }
-
-        $propObj = $this->root->createProperty($property['name'], null, $namedParameters);
-
-        foreach ($namelessParameters as $namelessParameter) {
-            $propObj->add(null, $namelessParameter);
-        }
-
-        if (strtoupper($propObj['ENCODING']) === 'QUOTED-PRINTABLE') {
-            $propObj->setQuotedPrintableValue($this->extractQuotedPrintableValue());
-        } else {
-            $charset = $this->charset;
-            if ($this->root->getDocumentType() === Document::VCARD21 && isset($propObj['CHARSET'])) {
-                // vCard 2.1 allows the character set to be specified per property.
-                $charset = (string)$propObj['CHARSET'];
-            }
-            switch ($charset) {
-                case 'UTF-8' :
-                    break;
-                case 'ISO-8859-1' :
-                    $property['value'] = utf8_encode($property['value']);
-                    break;
-                case 'Windows-1252' :
-                    $property['value'] = mb_convert_encoding($property['value'], 'UTF-8', $charset);
-                    break;
-                default :
-                    throw new ParseException('Unsupported CHARSET: ' . $propObj['CHARSET']);
-            }
-            $propObj->setRawMimeDirValue($property['value']);
-        }
-
-        return $propObj;
-
-    }
-
-    /**
-     * Unescapes a property value.
-     *
-     * vCard 2.1 says:
-     *   * Semi-colons must be escaped in some property values, specifically
-     *     ADR, ORG and N.
-     *   * Semi-colons must be escaped in parameter values, because semi-colons
-     *     are also use to separate values.
-     *   * No mention of escaping backslashes with another backslash.
-     *   * newlines are not escaped either, instead QUOTED-PRINTABLE is used to
-     *     span values over more than 1 line.
-     *
-     * vCard 3.0 says:
-     *   * (rfc2425) Backslashes, newlines (\n or \N) and comma's must be
-     *     escaped, all time time.
-     *   * Comma's are used for delimeters in multiple values
-     *   * (rfc2426) Adds to to this that the semi-colon MUST also be escaped,
-     *     as in some properties semi-colon is used for separators.
-     *   * Properties using semi-colons: N, ADR, GEO, ORG
-     *   * Both ADR and N's individual parts may be broken up further with a
-     *     comma.
-     *   * Properties using commas: NICKNAME, CATEGORIES
-     *
-     * vCard 4.0 (rfc6350) says:
-     *   * Commas must be escaped.
-     *   * Semi-colons may be escaped, an unescaped semi-colon _may_ be a
-     *     delimiter, depending on the property.
-     *   * Backslashes must be escaped
-     *   * Newlines must be escaped as either \N or \n.
-     *   * Some compound properties may contain multiple parts themselves, so a
-     *     comma within a semi-colon delimited property may also be unescaped
-     *     to denote multiple parts _within_ the compound property.
-     *   * Text-properties using semi-colons: N, ADR, ORG, CLIENTPIDMAP.
-     *   * Text-properties using commas: NICKNAME, RELATED, CATEGORIES, PID.
-     *
-     * Even though the spec says that commas must always be escaped, the
-     * example for GEO in Section 6.5.2 seems to violate this.
-     *
-     * iCalendar 2.0 (rfc5545) says:
-     *   * Commas or semi-colons may be used as delimiters, depending on the
-     *     property.
-     *   * Commas, semi-colons, backslashes, newline (\N or \n) are always
-     *     escaped, unless they are delimiters.
-     *   * Colons shall not be escaped.
-     *   * Commas can be considered the 'default delimiter' and is described as
-     *     the delimiter in cases where the order of the multiple values is
-     *     insignificant.
-     *   * Semi-colons are described as the delimiter for 'structured values'.
-     *     They are specifically used in Semi-colons are used as a delimiter in
-     *     REQUEST-STATUS, RRULE, GEO and EXRULE. EXRULE is deprecated however.
-     *
-     * Now for the parameters
-     *
-     * If delimiter is not set (null) this method will just return a string.
-     * If it's a comma or a semi-colon the string will be split on those
-     * characters, and always return an array.
-     *
-     * @param string $input
-     * @param string $delimiter
-     *
-     * @return string|string[]
-     */
-    static function unescapeValue($input, $delimiter = ';') {
-
-        $regex = '#  (?: (\\\\ (?: \\\\ | N | n | ; | , ) )';
-        if ($delimiter) {
-            $regex .= ' | (' . $delimiter . ')';
-        }
-        $regex .= ') #x';
-
-        $matches = preg_split($regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-
-        $resultArray = [];
-        $result = '';
-
-        foreach ($matches as $match) {
-
-            switch ($match) {
-                case '\\\\' :
-                    $result .= '\\';
-                    break;
-                case '\N' :
-                case '\n' :
-                    $result .= "\n";
-                    break;
-                case '\;' :
-                    $result .= ';';
-                    break;
-                case '\,' :
-                    $result .= ',';
-                    break;
-                case $delimiter :
-                    $resultArray[] = $result;
-                    $result = '';
-                    break;
-                default :
-                    $result .= $match;
-                    break;
-
-            }
-
-        }
-
-        $resultArray[] = $result;
-        return $delimiter ? $resultArray : $result;
-
-    }
-
-    /**
-     * Unescapes a parameter value.
-     *
-     * vCard 2.1:
-     *   * Does not mention a mechanism for this. In addition, double quotes
-     *     are never used to wrap values.
-     *   * This means that parameters can simply not contain colons or
-     *     semi-colons.
-     *
-     * vCard 3.0 (rfc2425, rfc2426):
-     *   * Parameters _may_ be surrounded by double quotes.
-     *   * If this is not the case, semi-colon, colon and comma may simply not
-     *     occur (the comma used for multiple parameter values though).
-     *   * If it is surrounded by double-quotes, it may simply not contain
-     *     double-quotes.
-     *   * This means that a parameter can in no case encode double-quotes, or
-     *     newlines.
-     *
-     * vCard 4.0 (rfc6350)
-     *   * Behavior seems to be identical to vCard 3.0
-     *
-     * iCalendar 2.0 (rfc5545)
-     *   * Behavior seems to be identical to vCard 3.0
-     *
-     * Parameter escaping mechanism (rfc6868) :
-     *   * This rfc describes a new way to escape parameter values.
-     *   * New-line is encoded as ^n
-     *   * ^ is encoded as ^^.
-     *   * " is encoded as ^'
-     *
-     * @param string $input
-     *
-     * @return void
-     */
-    private function unescapeParam($input) {
-
-        return
-            preg_replace_callback(
-                '#(\^(\^|n|\'))#',
-                function($matches) {
-                    switch ($matches[2]) {
-                        case 'n' :
-                            return "\n";
-                        case '^' :
-                            return '^';
-                        case '\'' :
-                            return '"';
-
-                    // @codeCoverageIgnoreStart
-                    }
-                    // @codeCoverageIgnoreEnd
-                },
-                $input
-            );
-    }
-
-    /**
-     * Gets the full quoted printable value.
-     *
-     * We need a special method for this, because newlines have both a meaning
-     * in vCards, and in QuotedPrintable.
-     *
-     * This method does not do any decoding.
-     *
-     * @return string
-     */
-    private function extractQuotedPrintableValue() {
-
-        // We need to parse the raw line again to get the start of the value.
-        //
-        // We are basically looking for the first colon (:), but we need to
-        // skip over the parameters first, as they may contain one.
-        $regex = '/^
+		preg_match_all($regex, $line, $matches,  PREG_SET_ORDER);
+
+		$property = [
+			'name'       => null,
+			'parameters' => [],
+			'value'      => null
+		];
+
+		$lastParam = null;
+
+		/**
+		 * Looping through all the tokens.
+		 *
+		 * Note that we are looping through them in reverse order, because if a
+		 * sub-pattern matched, the subsequent named patterns will not show up
+		 * in the result.
+		 */
+		foreach ($matches as $match) {
+
+			if (isset($match['paramValue'])) {
+				if ($match['paramValue'] && $match['paramValue'][0] === '"') {
+					$value = substr($match['paramValue'], 1, -1);
+				} else {
+					$value = $match['paramValue'];
+				}
+
+				$value = $this->unescapeParam($value);
+
+				if (is_null($lastParam)) {
+					throw new ParseException('Invalid Mimedir file. Line starting at ' . $this->startLine . ' did not follow iCalendar/vCard conventions');
+				}
+				if (is_null($property['parameters'][$lastParam])) {
+					$property['parameters'][$lastParam] = $value;
+				} elseif (is_array($property['parameters'][$lastParam])) {
+					$property['parameters'][$lastParam][] = $value;
+				} else {
+					$property['parameters'][$lastParam] = [
+						$property['parameters'][$lastParam],
+						$value
+					];
+				}
+				continue;
+			}
+			if (isset($match['paramName'])) {
+				$lastParam = strtoupper($match['paramName']);
+				if (!isset($property['parameters'][$lastParam])) {
+					$property['parameters'][$lastParam] = null;
+				}
+				continue;
+			}
+			if (isset($match['propValue'])) {
+				$property['value'] = $match['propValue'];
+				continue;
+			}
+			if (isset($match['name']) && $match['name']) {
+				$property['name'] = strtoupper($match['name']);
+				continue;
+			}
+
+			// @codeCoverageIgnoreStart
+			throw new \LogicException('This code should not be reachable');
+			// @codeCoverageIgnoreEnd
+
+		}
+
+		if (is_null($property['value'])) {
+			$property['value'] = '';
+		}
+		if (!$property['name']) {
+			if ($this->options & self::OPTION_IGNORE_INVALID_LINES) {
+				return false;
+			}
+			throw new ParseException('Invalid Mimedir file. Line starting at ' . $this->startLine . ' did not follow iCalendar/vCard conventions');
+		}
+
+		// vCard 2.1 states that parameters may appear without a name, and only
+		// a value. We can deduce the value based on it's name.
+		//
+		// Our parser will get those as parameters without a value instead, so
+		// we're filtering these parameters out first.
+		$namedParameters = [];
+		$namelessParameters = [];
+
+		foreach ($property['parameters'] as $name => $value) {
+			if (!is_null($value)) {
+				$namedParameters[$name] = $value;
+			} else {
+				$namelessParameters[] = $name;
+			}
+		}
+
+		$propObj = $this->root->createProperty($property['name'], null, $namedParameters);
+
+		foreach ($namelessParameters as $namelessParameter) {
+			$propObj->add(null, $namelessParameter);
+		}
+
+		if (strtoupper($propObj['ENCODING']) === 'QUOTED-PRINTABLE') {
+			$propObj->setQuotedPrintableValue($this->extractQuotedPrintableValue());
+		} else {
+			$charset = $this->charset;
+			if ($this->root->getDocumentType() === Document::VCARD21 && isset($propObj['CHARSET'])) {
+				// vCard 2.1 allows the character set to be specified per property.
+				$charset = (string)$propObj['CHARSET'];
+			}
+			switch ($charset) {
+				case 'UTF-8' :
+					break;
+				case 'ISO-8859-1' :
+					$property['value'] = utf8_encode($property['value']);
+					break;
+				case 'Windows-1252' :
+					$property['value'] = mb_convert_encoding($property['value'], 'UTF-8', $charset);
+					break;
+				default :
+					throw new ParseException('Unsupported CHARSET: ' . $propObj['CHARSET']);
+			}
+			$propObj->setRawMimeDirValue($property['value']);
+		}
+
+		return $propObj;
+
+	}
+
+	/**
+	 * Unescapes a property value.
+	 *
+	 * vCard 2.1 says:
+	 *   * Semi-colons must be escaped in some property values, specifically
+	 *     ADR, ORG and N.
+	 *   * Semi-colons must be escaped in parameter values, because semi-colons
+	 *     are also use to separate values.
+	 *   * No mention of escaping backslashes with another backslash.
+	 *   * newlines are not escaped either, instead QUOTED-PRINTABLE is used to
+	 *     span values over more than 1 line.
+	 *
+	 * vCard 3.0 says:
+	 *   * (rfc2425) Backslashes, newlines (\n or \N) and comma's must be
+	 *     escaped, all time time.
+	 *   * Comma's are used for delimeters in multiple values
+	 *   * (rfc2426) Adds to to this that the semi-colon MUST also be escaped,
+	 *     as in some properties semi-colon is used for separators.
+	 *   * Properties using semi-colons: N, ADR, GEO, ORG
+	 *   * Both ADR and N's individual parts may be broken up further with a
+	 *     comma.
+	 *   * Properties using commas: NICKNAME, CATEGORIES
+	 *
+	 * vCard 4.0 (rfc6350) says:
+	 *   * Commas must be escaped.
+	 *   * Semi-colons may be escaped, an unescaped semi-colon _may_ be a
+	 *     delimiter, depending on the property.
+	 *   * Backslashes must be escaped
+	 *   * Newlines must be escaped as either \N or \n.
+	 *   * Some compound properties may contain multiple parts themselves, so a
+	 *     comma within a semi-colon delimited property may also be unescaped
+	 *     to denote multiple parts _within_ the compound property.
+	 *   * Text-properties using semi-colons: N, ADR, ORG, CLIENTPIDMAP.
+	 *   * Text-properties using commas: NICKNAME, RELATED, CATEGORIES, PID.
+	 *
+	 * Even though the spec says that commas must always be escaped, the
+	 * example for GEO in Section 6.5.2 seems to violate this.
+	 *
+	 * iCalendar 2.0 (rfc5545) says:
+	 *   * Commas or semi-colons may be used as delimiters, depending on the
+	 *     property.
+	 *   * Commas, semi-colons, backslashes, newline (\N or \n) are always
+	 *     escaped, unless they are delimiters.
+	 *   * Colons shall not be escaped.
+	 *   * Commas can be considered the 'default delimiter' and is described as
+	 *     the delimiter in cases where the order of the multiple values is
+	 *     insignificant.
+	 *   * Semi-colons are described as the delimiter for 'structured values'.
+	 *     They are specifically used in Semi-colons are used as a delimiter in
+	 *     REQUEST-STATUS, RRULE, GEO and EXRULE. EXRULE is deprecated however.
+	 *
+	 * Now for the parameters
+	 *
+	 * If delimiter is not set (null) this method will just return a string.
+	 * If it's a comma or a semi-colon the string will be split on those
+	 * characters, and always return an array.
+	 *
+	 * @param string $input
+	 * @param string $delimiter
+	 *
+	 * @return string|string[]
+	 */
+	static function unescapeValue($input, $delimiter = ';') {
+
+		$regex = '#  (?: (\\\\ (?: \\\\ | N | n | ; | , ) )';
+		if ($delimiter) {
+			$regex .= ' | (' . $delimiter . ')';
+		}
+		$regex .= ') #x';
+
+		$matches = preg_split($regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+
+		$resultArray = [];
+		$result = '';
+
+		foreach ($matches as $match) {
+
+			switch ($match) {
+				case '\\\\' :
+					$result .= '\\';
+					break;
+				case '\N' :
+				case '\n' :
+					$result .= "\n";
+					break;
+				case '\;' :
+					$result .= ';';
+					break;
+				case '\,' :
+					$result .= ',';
+					break;
+				case $delimiter :
+					$resultArray[] = $result;
+					$result = '';
+					break;
+				default :
+					$result .= $match;
+					break;
+
+			}
+
+		}
+
+		$resultArray[] = $result;
+		return $delimiter ? $resultArray : $result;
+
+	}
+
+	/**
+	 * Unescapes a parameter value.
+	 *
+	 * vCard 2.1:
+	 *   * Does not mention a mechanism for this. In addition, double quotes
+	 *     are never used to wrap values.
+	 *   * This means that parameters can simply not contain colons or
+	 *     semi-colons.
+	 *
+	 * vCard 3.0 (rfc2425, rfc2426):
+	 *   * Parameters _may_ be surrounded by double quotes.
+	 *   * If this is not the case, semi-colon, colon and comma may simply not
+	 *     occur (the comma used for multiple parameter values though).
+	 *   * If it is surrounded by double-quotes, it may simply not contain
+	 *     double-quotes.
+	 *   * This means that a parameter can in no case encode double-quotes, or
+	 *     newlines.
+	 *
+	 * vCard 4.0 (rfc6350)
+	 *   * Behavior seems to be identical to vCard 3.0
+	 *
+	 * iCalendar 2.0 (rfc5545)
+	 *   * Behavior seems to be identical to vCard 3.0
+	 *
+	 * Parameter escaping mechanism (rfc6868) :
+	 *   * This rfc describes a new way to escape parameter values.
+	 *   * New-line is encoded as ^n
+	 *   * ^ is encoded as ^^.
+	 *   * " is encoded as ^'
+	 *
+	 * @param string $input
+	 *
+	 * @return void
+	 */
+	private function unescapeParam($input) {
+
+		return
+			preg_replace_callback(
+				'#(\^(\^|n|\'))#',
+				function($matches) {
+					switch ($matches[2]) {
+						case 'n' :
+							return "\n";
+						case '^' :
+							return '^';
+						case '\'' :
+							return '"';
+
+					// @codeCoverageIgnoreStart
+					}
+					// @codeCoverageIgnoreEnd
+				},
+				$input
+			);
+	}
+
+	/**
+	 * Gets the full quoted printable value.
+	 *
+	 * We need a special method for this, because newlines have both a meaning
+	 * in vCards, and in QuotedPrintable.
+	 *
+	 * This method does not do any decoding.
+	 *
+	 * @return string
+	 */
+	private function extractQuotedPrintableValue() {
+
+		// We need to parse the raw line again to get the start of the value.
+		//
+		// We are basically looking for the first colon (:), but we need to
+		// skip over the parameters first, as they may contain one.
+		$regex = '/^
             (?: [^:])+ # Anything but a colon
             (?: "[^"]")* # A parameter in double quotes
             : # start of the value we really care about
             (.*)$
         /xs';
 
-        preg_match($regex, $this->rawLine, $matches);
+		preg_match($regex, $this->rawLine, $matches);
 
-        $value = $matches[1];
-        // Removing the first whitespace character from every line. Kind of
-        // like unfolding, but we keep the newline.
-        $value = str_replace("\n ", "\n", $value);
+		$value = $matches[1];
+		// Removing the first whitespace character from every line. Kind of
+		// like unfolding, but we keep the newline.
+		$value = str_replace("\n ", "\n", $value);
 
-        // Microsoft products don't always correctly fold lines, they may be
-        // missing a whitespace. So if 'forgiving' is turned on, we will take
-        // those as well.
-        if ($this->options & self::OPTION_FORGIVING) {
-            while (substr($value, -1) === '=') {
-                // Reading the line
-                $this->readLine();
-                // Grabbing the raw form
-                $value .= "\n" . $this->rawLine;
-            }
-        }
+		// Microsoft products don't always correctly fold lines, they may be
+		// missing a whitespace. So if 'forgiving' is turned on, we will take
+		// those as well.
+		if ($this->options & self::OPTION_FORGIVING) {
+			while (substr($value, -1) === '=') {
+				// Reading the line
+				$this->readLine();
+				// Grabbing the raw form
+				$value .= "\n" . $this->rawLine;
+			}
+		}
 
-        return $value;
+		return $value;
 
-    }
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -358,7 +358,7 @@ 
             ) (?=[;:,])
             /xi";
 
-        preg_match_all($regex, $line, $matches,  PREG_SET_ORDER);
+        preg_match_all($regex, $line, $matches, PREG_SET_ORDER);
 
         $property = [
             'name'       => null,
@@ -461,7 +461,7 @@ 
             $charset = $this->charset;
             if ($this->root->getDocumentType() === Document::VCARD21 && isset($propObj['CHARSET'])) {
                 // vCard 2.1 allows the character set to be specified per property.
-                $charset = (string)$propObj['CHARSET'];
+                $charset = (string) $propObj['CHARSET'];
             }
             switch ($charset) {
                 case 'UTF-8' :

libraries/SabreDAV/VObject/Parser/XML/Element/KeyValue.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @param XML\Reader $reader
+     * @param SabreXml\Reader $reader
      *
      * @return mixed
      */

Indentation +41 added lines, -41 removed lines

@@ -15,56 +15,56 @@
  */
 class KeyValue extends SabreXml\Element\KeyValue {
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called staticly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * Important note 2: You are responsible for advancing the reader to the
-     * next element. Not doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param XML\Reader $reader
-     *
-     * @return mixed
-     */
-    static function xmlDeserialize(SabreXml\Reader $reader) {
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called staticly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * Important note 2: You are responsible for advancing the reader to the
+	 * next element. Not doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param XML\Reader $reader
+	 *
+	 * @return mixed
+	 */
+	static function xmlDeserialize(SabreXml\Reader $reader) {
 
-        // If there's no children, we don't do anything.
-        if ($reader->isEmptyElement) {
-            $reader->next();
-            return [];
-        }
+		// If there's no children, we don't do anything.
+		if ($reader->isEmptyElement) {
+			$reader->next();
+			return [];
+		}
 
-        $values = [];
-        $reader->read();
+		$values = [];
+		$reader->read();
 
-        do {
+		do {
 
-            if ($reader->nodeType === SabreXml\Reader::ELEMENT) {
+			if ($reader->nodeType === SabreXml\Reader::ELEMENT) {
 
-                $name = $reader->localName;
-                $values[$name] = $reader->parseCurrentElement()['value'];
+				$name = $reader->localName;
+				$values[$name] = $reader->parseCurrentElement()['value'];
 
-            } else {
-                $reader->read();
-            }
+			} else {
+				$reader->read();
+			}
 
-        } while ($reader->nodeType !== SabreXml\Reader::END_ELEMENT);
+		} while ($reader->nodeType !== SabreXml\Reader::END_ELEMENT);
 
-        $reader->read();
+		$reader->read();
 
-        return $values;
+		return $values;
 
-    }
+	}
 
 }