YetiForceCompany / YetiForceCRM

libraries/SabreDAV/VObject/Component/Available.php

Indentation +107 added lines, -107 removed lines

@@ -16,111 +16,111 @@
  */
 class Available extends VObject\Component {
 
-    /**
-     * Returns the 'effective start' and 'effective end' of this VAVAILABILITY
-     * component.
-     *
-     * We use the DTSTART and DTEND or DURATION to determine this.
-     *
-     * The returned value is an array containing DateTimeImmutable instances.
-     * If either the start or end is 'unbounded' its value will be null
-     * instead.
-     *
-     * @return array
-     */
-    public function getEffectiveStartEnd() {
-
-        $effectiveStart = $this->DTSTART->getDateTime();
-        if (isset($this->DTEND)) {
-            $effectiveEnd = $this->DTEND->getDateTime();
-        } else {
-            $effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
-        }
-
-        return [$effectiveStart, $effectiveEnd];
-
-    }
-
-    /**
-     * 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 [
-            'UID'     => 1,
-            'DTSTART' => 1,
-            'DTSTAMP' => 1,
-
-            'DTEND'    => '?',
-            'DURATION' => '?',
-
-            'CREATED'       => '?',
-            'DESCRIPTION'   => '?',
-            'LAST-MODIFIED' => '?',
-            'RECURRENCE-ID' => '?',
-            'RRULE'         => '?',
-            'SUMMARY'       => '?',
-
-            'CATEGORIES' => '*',
-            'COMMENT'    => '*',
-            'CONTACT'    => '*',
-            'EXDATE'     => '*',
-            'RDATE'      => '*',
-
-            'AVAILABLE' => '*',
-        ];
-
-    }
-
-    /**
-     * 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) {
-
-        $result = parent::validate($options);
-
-        if (isset($this->DTEND) && isset($this->DURATION)) {
-            $result[] = [
-                'level'   => 3,
-                'message' => 'DTEND and DURATION cannot both be present',
-                'node'    => $this
-            ];
-        }
-
-        return $result;
-
-    }
+	/**
+	 * Returns the 'effective start' and 'effective end' of this VAVAILABILITY
+	 * component.
+	 *
+	 * We use the DTSTART and DTEND or DURATION to determine this.
+	 *
+	 * The returned value is an array containing DateTimeImmutable instances.
+	 * If either the start or end is 'unbounded' its value will be null
+	 * instead.
+	 *
+	 * @return array
+	 */
+	public function getEffectiveStartEnd() {
+
+		$effectiveStart = $this->DTSTART->getDateTime();
+		if (isset($this->DTEND)) {
+			$effectiveEnd = $this->DTEND->getDateTime();
+		} else {
+			$effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
+		}
+
+		return [$effectiveStart, $effectiveEnd];
+
+	}
+
+	/**
+	 * 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 [
+			'UID'     => 1,
+			'DTSTART' => 1,
+			'DTSTAMP' => 1,
+
+			'DTEND'    => '?',
+			'DURATION' => '?',
+
+			'CREATED'       => '?',
+			'DESCRIPTION'   => '?',
+			'LAST-MODIFIED' => '?',
+			'RECURRENCE-ID' => '?',
+			'RRULE'         => '?',
+			'SUMMARY'       => '?',
+
+			'CATEGORIES' => '*',
+			'COMMENT'    => '*',
+			'CONTACT'    => '*',
+			'EXDATE'     => '*',
+			'RDATE'      => '*',
+
+			'AVAILABLE' => '*',
+		];
+
+	}
+
+	/**
+	 * 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) {
+
+		$result = parent::validate($options);
+
+		if (isset($this->DTEND) && isset($this->DURATION)) {
+			$result[] = [
+				'level'   => 3,
+				'message' => 'DTEND and DURATION cannot both be present',
+				'node'    => $this
+			];
+		}
+
+		return $result;
+
+	}
 }

libraries/SabreDAV/VObject/Component/VCard.php

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/Component/VEvent.php

Indentation +131 added lines, -131 removed lines

@@ -18,136 +18,136 @@
  */
 class VEvent extends VObject\Component {
 
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
-
-        if ($this->RRULE) {
-
-            try {
-
-                $it = new EventIterator($this, null, $start->getTimezone());
-
-            } catch (NoInstancesException $e) {
-
-                // If we've catched this exception, there are no instances
-                // for the event that fall into the specified time-range.
-                return false;
-
-            }
-
-            $it->fastForward($start);
-
-            // We fast-forwarded to a spot where the end-time of the
-            // recurrence instance exceeded the start of the requested
-            // time-range.
-            //
-            // If the starttime of the recurrence did not exceed the
-            // end of the time range as well, we have a match.
-            return ($it->getDTStart() < $end && $it->getDTEnd() > $start);
-
-        }
-
-        $effectiveStart = $this->DTSTART->getDateTime($start->getTimezone());
-        if (isset($this->DTEND)) {
-
-            // The DTEND property is considered non inclusive. So for a 3 day
-            // event in july, dtstart and dtend would have to be July 1st and
-            // July 4th respectively.
-            //
-            // See:
-            // http://tools.ietf.org/html/rfc5545#page-54
-            $effectiveEnd = $this->DTEND->getDateTime($end->getTimezone());
-
-        } elseif (isset($this->DURATION)) {
-            $effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
-        } elseif (!$this->DTSTART->hasTime()) {
-            $effectiveEnd = $effectiveStart->modify('+1 day');
-        } else {
-            $effectiveEnd = $effectiveStart;
-        }
-        return (
-            ($start < $effectiveEnd) && ($end > $effectiveStart)
-        );
-
-    }
-
-    /**
-     * This method should return a list of default property values.
-     *
-     * @return array
-     */
-    protected function getDefaults() {
-
-        return [
-            'UID'     => 'sabre-vobject-' . VObject\UUIDUtil::getUUID(),
-            'DTSTAMP' => date('Ymd\\THis\\Z'),
-        ];
-
-    }
-
-    /**
-     * 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() {
-
-        $hasMethod = isset($this->parent->METHOD);
-        return [
-            'UID'           => 1,
-            'DTSTAMP'       => 1,
-            'DTSTART'       => $hasMethod ? '?' : '1',
-            'CLASS'         => '?',
-            'CREATED'       => '?',
-            'DESCRIPTION'   => '?',
-            'GEO'           => '?',
-            'LAST-MODIFIED' => '?',
-            'LOCATION'      => '?',
-            'ORGANIZER'     => '?',
-            'PRIORITY'      => '?',
-            'SEQUENCE'      => '?',
-            'STATUS'        => '?',
-            'SUMMARY'       => '?',
-            'TRANSP'        => '?',
-            'URL'           => '?',
-            'RECURRENCE-ID' => '?',
-            'RRULE'         => '?',
-            'DTEND'         => '?',
-            'DURATION'      => '?',
-
-            'ATTACH'         => '*',
-            'ATTENDEE'       => '*',
-            'CATEGORIES'     => '*',
-            'COMMENT'        => '*',
-            'CONTACT'        => '*',
-            'EXDATE'         => '*',
-            'REQUEST-STATUS' => '*',
-            'RELATED-TO'     => '*',
-            'RESOURCES'      => '*',
-            'RDATE'          => '*',
-        ];
-
-    }
+	/**
+	 * Returns true or false depending on if the event falls in the specified
+	 * time-range. This is used for filtering purposes.
+	 *
+	 * The rules used to determine if an event falls within the specified
+	 * time-range is based on the CalDAV specification.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 *
+	 * @return bool
+	 */
+	public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
+
+		if ($this->RRULE) {
+
+			try {
+
+				$it = new EventIterator($this, null, $start->getTimezone());
+
+			} catch (NoInstancesException $e) {
+
+				// If we've catched this exception, there are no instances
+				// for the event that fall into the specified time-range.
+				return false;
+
+			}
+
+			$it->fastForward($start);
+
+			// We fast-forwarded to a spot where the end-time of the
+			// recurrence instance exceeded the start of the requested
+			// time-range.
+			//
+			// If the starttime of the recurrence did not exceed the
+			// end of the time range as well, we have a match.
+			return ($it->getDTStart() < $end && $it->getDTEnd() > $start);
+
+		}
+
+		$effectiveStart = $this->DTSTART->getDateTime($start->getTimezone());
+		if (isset($this->DTEND)) {
+
+			// The DTEND property is considered non inclusive. So for a 3 day
+			// event in july, dtstart and dtend would have to be July 1st and
+			// July 4th respectively.
+			//
+			// See:
+			// http://tools.ietf.org/html/rfc5545#page-54
+			$effectiveEnd = $this->DTEND->getDateTime($end->getTimezone());
+
+		} elseif (isset($this->DURATION)) {
+			$effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
+		} elseif (!$this->DTSTART->hasTime()) {
+			$effectiveEnd = $effectiveStart->modify('+1 day');
+		} else {
+			$effectiveEnd = $effectiveStart;
+		}
+		return (
+			($start < $effectiveEnd) && ($end > $effectiveStart)
+		);
+
+	}
+
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults() {
+
+		return [
+			'UID'     => 'sabre-vobject-' . VObject\UUIDUtil::getUUID(),
+			'DTSTAMP' => date('Ymd\\THis\\Z'),
+		];
+
+	}
+
+	/**
+	 * 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() {
+
+		$hasMethod = isset($this->parent->METHOD);
+		return [
+			'UID'           => 1,
+			'DTSTAMP'       => 1,
+			'DTSTART'       => $hasMethod ? '?' : '1',
+			'CLASS'         => '?',
+			'CREATED'       => '?',
+			'DESCRIPTION'   => '?',
+			'GEO'           => '?',
+			'LAST-MODIFIED' => '?',
+			'LOCATION'      => '?',
+			'ORGANIZER'     => '?',
+			'PRIORITY'      => '?',
+			'SEQUENCE'      => '?',
+			'STATUS'        => '?',
+			'SUMMARY'       => '?',
+			'TRANSP'        => '?',
+			'URL'           => '?',
+			'RECURRENCE-ID' => '?',
+			'RRULE'         => '?',
+			'DTEND'         => '?',
+			'DURATION'      => '?',
+
+			'ATTACH'         => '*',
+			'ATTENDEE'       => '*',
+			'CATEGORIES'     => '*',
+			'COMMENT'        => '*',
+			'CONTACT'        => '*',
+			'EXDATE'         => '*',
+			'REQUEST-STATUS' => '*',
+			'RELATED-TO'     => '*',
+			'RESOURCES'      => '*',
+			'RDATE'          => '*',
+		];
+
+	}
 
 }

libraries/SabreDAV/VObject/Component/VTimeZone.php

Indentation +40 added lines, -40 removed lines

@@ -16,52 +16,52 @@
  */
 class VTimeZone extends VObject\Component {
 
-    /**
-     * Returns the PHP DateTimeZone for this VTIMEZONE component.
-     *
-     * If we can't accurately determine the timezone, this method will return
-     * UTC.
-     *
-     * @return \DateTimeZone
-     */
-    public function getTimeZone() {
+	/**
+	 * Returns the PHP DateTimeZone for this VTIMEZONE component.
+	 *
+	 * If we can't accurately determine the timezone, this method will return
+	 * UTC.
+	 *
+	 * @return \DateTimeZone
+	 */
+	public function getTimeZone() {
 
-        return VObject\TimeZoneUtil::getTimeZone((string)$this->TZID, $this->root);
+		return VObject\TimeZoneUtil::getTimeZone((string)$this->TZID, $this->root);
 
-    }
+	}
 
-    /**
-     * 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() {
+	/**
+	 * 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 [
-            'TZID' => 1,
+		return [
+			'TZID' => 1,
 
-            'LAST-MODIFIED' => '?',
-            'TZURL'         => '?',
+			'LAST-MODIFIED' => '?',
+			'TZURL'         => '?',
 
-            // At least 1 STANDARD or DAYLIGHT must appear, or more. But both
-            // cannot appear in the same VTIMEZONE.
-            //
-            // The validator is not specific yet to pick this up, so these
-            // rules are too loose.
-            'STANDARD' => '*',
-            'DAYLIGHT' => '*',
-        ];
+			// At least 1 STANDARD or DAYLIGHT must appear, or more. But both
+			// cannot appear in the same VTIMEZONE.
+			//
+			// The validator is not specific yet to pick this up, so these
+			// rules are too loose.
+			'STANDARD' => '*',
+			'DAYLIGHT' => '*',
+		];
 
-    }
+	}
 
 }

libraries/SabreDAV/VObject/Component/VCalendar.php

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/VAvailability.php

Indentation +136 added lines, -136 removed lines

@@ -17,140 +17,140 @@
  */
 class VAvailability extends VObject\Component {
 
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on:
-     *
-     * https://tools.ietf.org/html/draft-daboo-calendar-availability-05#section-3.1
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
-
-        list($effectiveStart, $effectiveEnd) = $this->getEffectiveStartEnd();
-        return (
-            (is_null($effectiveStart) || $start < $effectiveEnd) &&
-            (is_null($effectiveEnd) || $end > $effectiveStart)
-        );
-
-    }
-
-    /**
-     * Returns the 'effective start' and 'effective end' of this VAVAILABILITY
-     * component.
-     *
-     * We use the DTSTART and DTEND or DURATION to determine this.
-     *
-     * The returned value is an array containing DateTimeImmutable instances.
-     * If either the start or end is 'unbounded' its value will be null
-     * instead.
-     *
-     * @return array
-     */
-    public function getEffectiveStartEnd() {
-
-        $effectiveStart = null;
-        $effectiveEnd = null;
-
-        if (isset($this->DTSTART)) {
-            $effectiveStart = $this->DTSTART->getDateTime();
-        }
-        if (isset($this->DTEND)) {
-            $effectiveEnd = $this->DTEND->getDateTime();
-        } elseif ($effectiveStart && isset($this->DURATION)) {
-            $effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
-        }
-
-        return [$effectiveStart, $effectiveEnd];
-
-    }
-
-
-    /**
-     * 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 [
-            'UID'     => 1,
-            'DTSTAMP' => 1,
-
-            'BUSYTYPE'      => '?',
-            'CLASS'         => '?',
-            'CREATED'       => '?',
-            'DESCRIPTION'   => '?',
-            'DTSTART'       => '?',
-            'LAST-MODIFIED' => '?',
-            'ORGANIZER'     => '?',
-            'PRIORITY'      => '?',
-            'SEQUENCE'      => '?',
-            'SUMMARY'       => '?',
-            'URL'           => '?',
-            'DTEND'         => '?',
-            'DURATION'      => '?',
-
-            'CATEGORIES' => '*',
-            'COMMENT'    => '*',
-            'CONTACT'    => '*',
-        ];
-
-    }
-
-    /**
-     * 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) {
-
-        $result = parent::validate($options);
-
-        if (isset($this->DTEND) && isset($this->DURATION)) {
-            $result[] = [
-                'level'   => 3,
-                'message' => 'DTEND and DURATION cannot both be present',
-                'node'    => $this
-            ];
-        }
-
-        return $result;
-
-    }
+	/**
+	 * Returns true or false depending on if the event falls in the specified
+	 * time-range. This is used for filtering purposes.
+	 *
+	 * The rules used to determine if an event falls within the specified
+	 * time-range is based on:
+	 *
+	 * https://tools.ietf.org/html/draft-daboo-calendar-availability-05#section-3.1
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 *
+	 * @return bool
+	 */
+	public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
+
+		list($effectiveStart, $effectiveEnd) = $this->getEffectiveStartEnd();
+		return (
+			(is_null($effectiveStart) || $start < $effectiveEnd) &&
+			(is_null($effectiveEnd) || $end > $effectiveStart)
+		);
+
+	}
+
+	/**
+	 * Returns the 'effective start' and 'effective end' of this VAVAILABILITY
+	 * component.
+	 *
+	 * We use the DTSTART and DTEND or DURATION to determine this.
+	 *
+	 * The returned value is an array containing DateTimeImmutable instances.
+	 * If either the start or end is 'unbounded' its value will be null
+	 * instead.
+	 *
+	 * @return array
+	 */
+	public function getEffectiveStartEnd() {
+
+		$effectiveStart = null;
+		$effectiveEnd = null;
+
+		if (isset($this->DTSTART)) {
+			$effectiveStart = $this->DTSTART->getDateTime();
+		}
+		if (isset($this->DTEND)) {
+			$effectiveEnd = $this->DTEND->getDateTime();
+		} elseif ($effectiveStart && isset($this->DURATION)) {
+			$effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
+		}
+
+		return [$effectiveStart, $effectiveEnd];
+
+	}
+
+
+	/**
+	 * 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 [
+			'UID'     => 1,
+			'DTSTAMP' => 1,
+
+			'BUSYTYPE'      => '?',
+			'CLASS'         => '?',
+			'CREATED'       => '?',
+			'DESCRIPTION'   => '?',
+			'DTSTART'       => '?',
+			'LAST-MODIFIED' => '?',
+			'ORGANIZER'     => '?',
+			'PRIORITY'      => '?',
+			'SEQUENCE'      => '?',
+			'SUMMARY'       => '?',
+			'URL'           => '?',
+			'DTEND'         => '?',
+			'DURATION'      => '?',
+
+			'CATEGORIES' => '*',
+			'COMMENT'    => '*',
+			'CONTACT'    => '*',
+		];
+
+	}
+
+	/**
+	 * 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) {
+
+		$result = parent::validate($options);
+
+		if (isset($this->DTEND) && isset($this->DURATION)) {
+			$result[] = [
+				'level'   => 3,
+				'message' => 'DTEND and DURATION cannot both be present',
+				'node'    => $this
+			];
+		}
+
+		return $result;
+
+	}
 }

libraries/SabreDAV/VObject/Component/VJournal.php

Indentation +88 added lines, -88 removed lines

@@ -16,92 +16,92 @@
  */
 class VJournal extends VObject\Component {
 
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
-
-        $dtstart = isset($this->DTSTART) ? $this->DTSTART->getDateTime() : null;
-        if ($dtstart) {
-            $effectiveEnd = $dtstart;
-            if (!$this->DTSTART->hasTime()) {
-                $effectiveEnd = $effectiveEnd->modify('+1 day');
-            }
-
-            return ($start <= $effectiveEnd && $end > $dtstart);
-
-        }
-        return false;
-
-    }
-
-    /**
-     * 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 [
-            'UID'     => 1,
-            'DTSTAMP' => 1,
-
-            'CLASS'         => '?',
-            'CREATED'       => '?',
-            'DTSTART'       => '?',
-            'LAST-MODIFIED' => '?',
-            'ORGANIZER'     => '?',
-            'RECURRENCE-ID' => '?',
-            'SEQUENCE'      => '?',
-            'STATUS'        => '?',
-            'SUMMARY'       => '?',
-            'URL'           => '?',
-
-            'RRULE' => '?',
-
-            'ATTACH'      => '*',
-            'ATTENDEE'    => '*',
-            'CATEGORIES'  => '*',
-            'COMMENT'     => '*',
-            'CONTACT'     => '*',
-            'DESCRIPTION' => '*',
-            'EXDATE'      => '*',
-            'RELATED-TO'  => '*',
-            'RDATE'       => '*',
-        ];
-
-    }
-
-    /**
-     * This method should return a list of default property values.
-     *
-     * @return array
-     */
-    protected function getDefaults() {
-
-        return [
-            'UID'     => 'sabre-vobject-' . VObject\UUIDUtil::getUUID(),
-            'DTSTAMP' => date('Ymd\\THis\\Z'),
-        ];
-
-    }
+	/**
+	 * Returns true or false depending on if the event falls in the specified
+	 * time-range. This is used for filtering purposes.
+	 *
+	 * The rules used to determine if an event falls within the specified
+	 * time-range is based on the CalDAV specification.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 *
+	 * @return bool
+	 */
+	public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
+
+		$dtstart = isset($this->DTSTART) ? $this->DTSTART->getDateTime() : null;
+		if ($dtstart) {
+			$effectiveEnd = $dtstart;
+			if (!$this->DTSTART->hasTime()) {
+				$effectiveEnd = $effectiveEnd->modify('+1 day');
+			}
+
+			return ($start <= $effectiveEnd && $end > $dtstart);
+
+		}
+		return false;
+
+	}
+
+	/**
+	 * 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 [
+			'UID'     => 1,
+			'DTSTAMP' => 1,
+
+			'CLASS'         => '?',
+			'CREATED'       => '?',
+			'DTSTART'       => '?',
+			'LAST-MODIFIED' => '?',
+			'ORGANIZER'     => '?',
+			'RECURRENCE-ID' => '?',
+			'SEQUENCE'      => '?',
+			'STATUS'        => '?',
+			'SUMMARY'       => '?',
+			'URL'           => '?',
+
+			'RRULE' => '?',
+
+			'ATTACH'      => '*',
+			'ATTENDEE'    => '*',
+			'CATEGORIES'  => '*',
+			'COMMENT'     => '*',
+			'CONTACT'     => '*',
+			'DESCRIPTION' => '*',
+			'EXDATE'      => '*',
+			'RELATED-TO'  => '*',
+			'RDATE'       => '*',
+		];
+
+	}
+
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults() {
+
+		return [
+			'UID'     => 'sabre-vobject-' . VObject\UUIDUtil::getUUID(),
+			'DTSTAMP' => date('Ymd\\THis\\Z'),
+		];
+
+	}
 }

libraries/SabreDAV/VObject/Component/VTodo.php

Indentation +173 added lines, -173 removed lines

@@ -16,178 +16,178 @@
  */
 class VTodo extends VObject\Component {
 
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
-
-        $dtstart = isset($this->DTSTART) ? $this->DTSTART->getDateTime() : null;
-        $duration = isset($this->DURATION) ? VObject\DateTimeParser::parseDuration($this->DURATION) : null;
-        $due = isset($this->DUE) ? $this->DUE->getDateTime() : null;
-        $completed = isset($this->COMPLETED) ? $this->COMPLETED->getDateTime() : null;
-        $created = isset($this->CREATED) ? $this->CREATED->getDateTime() : null;
-
-        if ($dtstart) {
-            if ($duration) {
-                $effectiveEnd = $dtstart->add($duration);
-                return $start <= $effectiveEnd && $end > $dtstart;
-            } elseif ($due) {
-                return
-                    ($start < $due || $start <= $dtstart) &&
-                    ($end > $dtstart || $end >= $due);
-            } else {
-                return $start <= $dtstart && $end > $dtstart;
-            }
-        }
-        if ($due) {
-            return ($start < $due && $end >= $due);
-        }
-        if ($completed && $created) {
-            return
-                ($start <= $created || $start <= $completed) &&
-                ($end >= $created || $end >= $completed);
-        }
-        if ($completed) {
-            return ($start <= $completed && $end >= $completed);
-        }
-        if ($created) {
-            return ($end > $created);
-        }
-        return true;
-
-    }
-
-    /**
-     * 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 [
-            'UID'     => 1,
-            'DTSTAMP' => 1,
-
-            'CLASS'         => '?',
-            'COMPLETED'     => '?',
-            'CREATED'       => '?',
-            'DESCRIPTION'   => '?',
-            'DTSTART'       => '?',
-            'GEO'           => '?',
-            'LAST-MODIFIED' => '?',
-            'LOCATION'      => '?',
-            'ORGANIZER'     => '?',
-            'PERCENT'       => '?',
-            'PRIORITY'      => '?',
-            'RECURRENCE-ID' => '?',
-            'SEQUENCE'      => '?',
-            'STATUS'        => '?',
-            'SUMMARY'       => '?',
-            'URL'           => '?',
-
-            'RRULE'    => '?',
-            'DUE'      => '?',
-            'DURATION' => '?',
-
-            'ATTACH'         => '*',
-            'ATTENDEE'       => '*',
-            'CATEGORIES'     => '*',
-            'COMMENT'        => '*',
-            'CONTACT'        => '*',
-            'EXDATE'         => '*',
-            'REQUEST-STATUS' => '*',
-            'RELATED-TO'     => '*',
-            'RESOURCES'      => '*',
-            'RDATE'          => '*',
-        ];
-
-    }
-
-    /**
-     * 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) {
-
-        $result = parent::validate($options);
-        if (isset($this->DUE) && isset($this->DTSTART)) {
-
-            $due = $this->DUE;
-            $dtStart = $this->DTSTART;
-
-            if ($due->getValueType() !== $dtStart->getValueType()) {
-
-                $result[] = [
-                    'level'   => 3,
-                    'message' => 'The value type (DATE or DATE-TIME) must be identical for DUE and DTSTART',
-                    'node'    => $due,
-                ];
-
-            } elseif ($due->getDateTime() < $dtStart->getDateTime()) {
-
-                $result[] = [
-                    'level'   => 3,
-                    'message' => 'DUE must occur after DTSTART',
-                    'node'    => $due,
-                ];
-
-            }
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * This method should return a list of default property values.
-     *
-     * @return array
-     */
-    protected function getDefaults() {
-
-        return [
-            'UID'     => 'sabre-vobject-' . VObject\UUIDUtil::getUUID(),
-            'DTSTAMP' => date('Ymd\\THis\\Z'),
-        ];
-
-    }
+	/**
+	 * Returns true or false depending on if the event falls in the specified
+	 * time-range. This is used for filtering purposes.
+	 *
+	 * The rules used to determine if an event falls within the specified
+	 * time-range is based on the CalDAV specification.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 *
+	 * @return bool
+	 */
+	public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
+
+		$dtstart = isset($this->DTSTART) ? $this->DTSTART->getDateTime() : null;
+		$duration = isset($this->DURATION) ? VObject\DateTimeParser::parseDuration($this->DURATION) : null;
+		$due = isset($this->DUE) ? $this->DUE->getDateTime() : null;
+		$completed = isset($this->COMPLETED) ? $this->COMPLETED->getDateTime() : null;
+		$created = isset($this->CREATED) ? $this->CREATED->getDateTime() : null;
+
+		if ($dtstart) {
+			if ($duration) {
+				$effectiveEnd = $dtstart->add($duration);
+				return $start <= $effectiveEnd && $end > $dtstart;
+			} elseif ($due) {
+				return
+					($start < $due || $start <= $dtstart) &&
+					($end > $dtstart || $end >= $due);
+			} else {
+				return $start <= $dtstart && $end > $dtstart;
+			}
+		}
+		if ($due) {
+			return ($start < $due && $end >= $due);
+		}
+		if ($completed && $created) {
+			return
+				($start <= $created || $start <= $completed) &&
+				($end >= $created || $end >= $completed);
+		}
+		if ($completed) {
+			return ($start <= $completed && $end >= $completed);
+		}
+		if ($created) {
+			return ($end > $created);
+		}
+		return true;
+
+	}
+
+	/**
+	 * 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 [
+			'UID'     => 1,
+			'DTSTAMP' => 1,
+
+			'CLASS'         => '?',
+			'COMPLETED'     => '?',
+			'CREATED'       => '?',
+			'DESCRIPTION'   => '?',
+			'DTSTART'       => '?',
+			'GEO'           => '?',
+			'LAST-MODIFIED' => '?',
+			'LOCATION'      => '?',
+			'ORGANIZER'     => '?',
+			'PERCENT'       => '?',
+			'PRIORITY'      => '?',
+			'RECURRENCE-ID' => '?',
+			'SEQUENCE'      => '?',
+			'STATUS'        => '?',
+			'SUMMARY'       => '?',
+			'URL'           => '?',
+
+			'RRULE'    => '?',
+			'DUE'      => '?',
+			'DURATION' => '?',
+
+			'ATTACH'         => '*',
+			'ATTENDEE'       => '*',
+			'CATEGORIES'     => '*',
+			'COMMENT'        => '*',
+			'CONTACT'        => '*',
+			'EXDATE'         => '*',
+			'REQUEST-STATUS' => '*',
+			'RELATED-TO'     => '*',
+			'RESOURCES'      => '*',
+			'RDATE'          => '*',
+		];
+
+	}
+
+	/**
+	 * 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) {
+
+		$result = parent::validate($options);
+		if (isset($this->DUE) && isset($this->DTSTART)) {
+
+			$due = $this->DUE;
+			$dtStart = $this->DTSTART;
+
+			if ($due->getValueType() !== $dtStart->getValueType()) {
+
+				$result[] = [
+					'level'   => 3,
+					'message' => 'The value type (DATE or DATE-TIME) must be identical for DUE and DTSTART',
+					'node'    => $due,
+				];
+
+			} elseif ($due->getDateTime() < $dtStart->getDateTime()) {
+
+				$result[] = [
+					'level'   => 3,
+					'message' => 'DUE must occur after DTSTART',
+					'node'    => $due,
+				];
+
+			}
+
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults() {
+
+		return [
+			'UID'     => 'sabre-vobject-' . VObject\UUIDUtil::getUUID(),
+			'DTSTAMP' => date('Ymd\\THis\\Z'),
+		];
+
+	}
 
 }

libraries/SabreDAV/VObject/PHPUnitAssertions.php

Indentation +53 added lines, -53 removed lines

@@ -14,69 +14,69 @@
  */
 trait PHPUnitAssertions {
 
-    /**
-     * This method tests wether two vcards or icalendar objects are
-     * semantically identical.
-     *
-     * It supports objects being supplied as strings, streams or
-     * Sabre\VObject\Component instances.
-     *
-     * PRODID is removed from both objects as this is often changes and would
-     * just get in the way.
-     *
-     * CALSCALE will automatically get removed if it's set to GREGORIAN.
-     *
-     * Any property that has the value **ANY** will be treated as a wildcard.
-     *
-     * @param resource|string|Component $expected
-     * @param resource|string|Component $actual
-     * @param string $message
-     */
-    public function assertVObjectEqualsVObject($expected, $actual, $message = '') {
+	/**
+	 * This method tests wether two vcards or icalendar objects are
+	 * semantically identical.
+	 *
+	 * It supports objects being supplied as strings, streams or
+	 * Sabre\VObject\Component instances.
+	 *
+	 * PRODID is removed from both objects as this is often changes and would
+	 * just get in the way.
+	 *
+	 * CALSCALE will automatically get removed if it's set to GREGORIAN.
+	 *
+	 * Any property that has the value **ANY** will be treated as a wildcard.
+	 *
+	 * @param resource|string|Component $expected
+	 * @param resource|string|Component $actual
+	 * @param string $message
+	 */
+	public function assertVObjectEqualsVObject($expected, $actual, $message = '') {
 
-        $self = $this;
-        $getObj = function($input) use ($self) {
+		$self = $this;
+		$getObj = function($input) use ($self) {
 
-            if (is_resource($input)) {
-                $input = stream_get_contents($input);
-            }
-            if (is_string($input)) {
-                $input = Reader::read($input);
-            }
-            if (!$input instanceof Component) {
-                $this->fail('Input must be a string, stream or VObject component');
-            }
-            unset($input->PRODID);
-            if ($input instanceof Component\VCalendar && (string)$input->CALSCALE === 'GREGORIAN') {
-                unset($input->CALSCALE);
-            }
-            return $input;
+			if (is_resource($input)) {
+				$input = stream_get_contents($input);
+			}
+			if (is_string($input)) {
+				$input = Reader::read($input);
+			}
+			if (!$input instanceof Component) {
+				$this->fail('Input must be a string, stream or VObject component');
+			}
+			unset($input->PRODID);
+			if ($input instanceof Component\VCalendar && (string)$input->CALSCALE === 'GREGORIAN') {
+				unset($input->CALSCALE);
+			}
+			return $input;
 
-        };
+		};
 
-        $expected = $getObj($expected)->serialize();
-        $actual = $getObj($actual)->serialize();
+		$expected = $getObj($expected)->serialize();
+		$actual = $getObj($actual)->serialize();
 
-        // Finding wildcards in expected.
-        preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expected, $matches, PREG_SET_ORDER);
+		// Finding wildcards in expected.
+		preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expected, $matches, PREG_SET_ORDER);
 
-        foreach ($matches as $match) {
+		foreach ($matches as $match) {
 
-            $actual = preg_replace(
-                '|^' . preg_quote($match[1], '|') . ':(.*)\r$|m',
-                $match[1] . ':**ANY**' . "\r",
-                $actual
-            );
+			$actual = preg_replace(
+				'|^' . preg_quote($match[1], '|') . ':(.*)\r$|m',
+				$match[1] . ':**ANY**' . "\r",
+				$actual
+			);
 
-        }
+		}
 
-        $this->assertEquals(
-            $expected,
-            $actual,
-            $message
-        );
+		$this->assertEquals(
+			$expected,
+			$actual,
+			$message
+		);
 
-    }
+	}
 
 
 }