YetiForceCompany / YetiForceCRM

libraries/SabreDAV/VObject/Property/IntegerValue.php

Indentation +69 added lines, -69 removed lines

@@ -3,7 +3,7 @@ 
 namespace Sabre\VObject\Property;
 
 use
-    Sabre\VObject\Property;
+	Sabre\VObject\Property;
 
 /**
  * Integer property.
@@ -17,72 +17,72 @@ 
  */
 class IntegerValue extends Property {
 
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue((int)$val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'INTEGER';
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        return [(int)$this->getValue()];
-
-    }
-
-    /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
-     * object.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setXmlValue(array $value) {
-
-        $value = array_map('intval', $value);
-        parent::setXmlValue($value);
-
-    }
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue((int)$val);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return $this->value;
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'INTEGER';
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		return [(int)$this->getValue()];
+
+	}
+
+	/**
+	 * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+	 * object.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setXmlValue(array $value) {
+
+		$value = array_map('intval', $value);
+		parent::setXmlValue($value);
+
+	}
 }

libraries/SabreDAV/VObject/Property/FloatValue.php

Indentation +121 added lines, -121 removed lines

@@ -17,126 +17,126 @@
  */
 class FloatValue extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = ';';
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $val = explode($this->delimiter, $val);
-        foreach ($val as &$item) {
-            $item = (float)$item;
-        }
-        $this->setParts($val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode(
-            $this->delimiter,
-            $this->getParts()
-        );
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'FLOAT';
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for JSON.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $val = array_map('floatval', $this->getParts());
-
-        // Special-casing the GEO property.
-        //
-        // See:
-        // http://tools.ietf.org/html/draft-ietf-jcardcal-jcal-04#section-3.4.1.2
-        if ($this->name === 'GEO') {
-            return [$val];
-        }
-
-        return $val;
-
-    }
-
-    /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
-     * object.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setXmlValue(array $value) {
-
-        $value = array_map('floatval', $value);
-        parent::setXmlValue($value);
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        // Special-casing the GEO property.
-        //
-        // See:
-        // http://tools.ietf.org/html/rfc6321#section-3.4.1.2
-        if ($this->name === 'GEO') {
-
-            $value = array_map('floatval', $this->getParts());
-
-            $writer->writeElement('latitude', $value[0]);
-            $writer->writeElement('longitude', $value[1]);
-
-        }
-        else {
-            parent::xmlSerializeValue($writer);
-        }
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = ';';
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$val = explode($this->delimiter, $val);
+		foreach ($val as &$item) {
+			$item = (float)$item;
+		}
+		$this->setParts($val);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return implode(
+			$this->delimiter,
+			$this->getParts()
+		);
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'FLOAT';
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for JSON.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		$val = array_map('floatval', $this->getParts());
+
+		// Special-casing the GEO property.
+		//
+		// See:
+		// http://tools.ietf.org/html/draft-ietf-jcardcal-jcal-04#section-3.4.1.2
+		if ($this->name === 'GEO') {
+			return [$val];
+		}
+
+		return $val;
+
+	}
+
+	/**
+	 * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+	 * object.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setXmlValue(array $value) {
+
+		$value = array_map('floatval', $value);
+		parent::setXmlValue($value);
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		// Special-casing the GEO property.
+		//
+		// See:
+		// http://tools.ietf.org/html/rfc6321#section-3.4.1.2
+		if ($this->name === 'GEO') {
+
+			$value = array_map('floatval', $this->getParts());
+
+			$writer->writeElement('latitude', $value[0]);
+			$writer->writeElement('longitude', $value[1]);
+
+		}
+		else {
+			parent::xmlSerializeValue($writer);
+		}
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/UtcOffset.php

Indentation +52 added lines, -52 removed lines

@@ -13,65 +13,65 @@
  */
 class UtcOffset extends Text {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = null;
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = null;
 
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
 
-        return 'UTC-OFFSET';
+		return 'UTC-OFFSET';
 
-    }
+	}
 
-    /**
-     * Sets the JSON value, as it would appear in a jCard or jCal object.
-     *
-     * The value must always be an array.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setJsonValue(array $value) {
+	/**
+	 * Sets the JSON value, as it would appear in a jCard or jCal object.
+	 *
+	 * The value must always be an array.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setJsonValue(array $value) {
 
-        $value = array_map(
-            public function($value) {
-                return str_replace(':', '', $value);
-            },
-            $value
-        );
-        parent::setJsonValue($value);
+		$value = array_map(
+			public function($value) {
+				return str_replace(':', '', $value);
+			},
+			$value
+		);
+		parent::setJsonValue($value);
 
-    }
+	}
 
-    /**
-     * Returns the value, in the format it should be encoded for JSON.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
+	/**
+	 * Returns the value, in the format it should be encoded for JSON.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
 
-        return array_map(
-            public function($value) {
-                return substr($value, 0, -2) . ':' .
-                       substr($value, -2);
-            },
-            parent::getJsonValue()
-        );
+		return array_map(
+			public function($value) {
+				return substr($value, 0, -2) . ':' .
+					   substr($value, -2);
+			},
+			parent::getJsonValue()
+		);
 
-    }
+	}
 }

libraries/SabreDAV/VObject/Property/Binary.php

Indentation +104 added lines, -104 removed lines

@@ -20,109 +20,109 @@
  */
 class Binary extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = null;
-
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * @param string|array $value
-     *
-     * @return void
-     */
-    public function setValue($value) {
-
-        if (is_array($value)) {
-
-            if (count($value) === 1) {
-                $this->value = $value[0];
-            } else {
-                throw new \InvalidArgumentException('The argument must either be a string or an array with only one child');
-            }
-
-        } else {
-
-            $this->value = $value;
-
-        }
-
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->value = base64_decode($val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return base64_encode($this->value);
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'BINARY';
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        return [base64_encode($this->getValue())];
-
-    }
-
-    /**
-     * Sets the json value, as it would appear in a jCard or jCal object.
-     *
-     * The value must always be an array.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setJsonValue(array $value) {
-
-        $value = array_map('base64_decode', $value);
-        parent::setJsonValue($value);
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = null;
+
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * @param string|array $value
+	 *
+	 * @return void
+	 */
+	public function setValue($value) {
+
+		if (is_array($value)) {
+
+			if (count($value) === 1) {
+				$this->value = $value[0];
+			} else {
+				throw new \InvalidArgumentException('The argument must either be a string or an array with only one child');
+			}
+
+		} else {
+
+			$this->value = $value;
+
+		}
+
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->value = base64_decode($val);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return base64_encode($this->value);
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'BINARY';
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		return [base64_encode($this->getValue())];
+
+	}
+
+	/**
+	 * Sets the json value, as it would appear in a jCard or jCal object.
+	 *
+	 * The value must always be an array.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setJsonValue(array $value) {
+
+		$value = array_map('base64_decode', $value);
+		parent::setJsonValue($value);
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/FlatText.php

Indentation +19 added lines, -19 removed lines

@@ -24,27 +24,27 @@
  */
 class FlatText extends Text {
 
-    /**
-     * Field separator.
-     *
-     * @var string
-     */
-    public $delimiter = ',';
+	/**
+	 * Field separator.
+	 *
+	 * @var string
+	 */
+	public $delimiter = ',';
 
-    /**
-     * Sets the value as a quoted-printable encoded string.
-     *
-     * Overriding this so we're not splitting on a ; delimiter.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setQuotedPrintableValue($val) {
+	/**
+	 * Sets the value as a quoted-printable encoded string.
+	 *
+	 * Overriding this so we're not splitting on a ; delimiter.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setQuotedPrintableValue($val) {
 
-        $val = quoted_printable_decode($val);
-        $this->setValue($val);
+		$val = quoted_printable_decode($val);
+		$this->setValue($val);
 
-    }
+	}
 
 }

libraries/SabreDAV/VObject/Property/Text.php

Indentation +391 added lines, -391 removed lines

@@ -19,395 +19,395 @@
  */
 class Text extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string
-     */
-    public $delimiter = ',';
-
-    /**
-     * List of properties that are considered 'structured'.
-     *
-     * @var array
-     */
-    protected $structuredValues = [
-        // vCard
-        'N',
-        'ADR',
-        'ORG',
-        'GENDER',
-        'CLIENTPIDMAP',
-
-        // iCalendar
-        'REQUEST-STATUS',
-    ];
-
-    /**
-     * Some text components have a minimum number of components.
-     *
-     * N must for instance be represented as 5 components, separated by ;, even
-     * if the last few components are unused.
-     *
-     * @var array
-     */
-    protected $minimumPropertyValues = [
-        'N'   => 5,
-        'ADR' => 7,
-    ];
-
-    /**
-     * Creates the property.
-     *
-     * You can specify the parameters either in key=>value syntax, in which case
-     * parameters will automatically be created, or you can just pass a list of
-     * Parameter objects.
-     *
-     * @param Component $root The root document
-     * @param string $name
-     * @param string|array|null $value
-     * @param array $parameters List of parameters
-     * @param string $group The vcard property group
-     *
-     * @return void
-     */
-    public function __construct(Component $root, $name, $value = null, array $parameters = [], $group = null) {
-
-        // There's two types of multi-valued text properties:
-        // 1. multivalue properties.
-        // 2. structured value properties
-        //
-        // The former is always separated by a comma, the latter by semi-colon.
-        if (in_array($name, $this->structuredValues)) {
-            $this->delimiter = ';';
-        }
-
-        parent::__construct($root, $name, $value, $parameters, $group);
-
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue(MimeDir::unescapeValue($val, $this->delimiter));
-
-    }
-
-    /**
-     * Sets the value as a quoted-printable encoded string.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setQuotedPrintableValue($val) {
-
-        $val = quoted_printable_decode($val);
-
-        // Quoted printable only appears in vCard 2.1, and the only character
-        // that may be escaped there is ;. So we are simply splitting on just
-        // that.
-        //
-        // We also don't have to unescape \\, so all we need to look for is a ;
-        // that's not preceeded with a \.
-        $regex = '# (?<!\\\\) ; #x';
-        $matches = preg_split($regex, $val);
-        $this->setValue($matches);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        $val = $this->getParts();
-
-        if (isset($this->minimumPropertyValues[$this->name])) {
-            $val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
-        }
-
-        foreach ($val as &$item) {
-
-            if (!is_array($item)) {
-                $item = [$item];
-            }
-
-            foreach ($item as &$subItem) {
-                $subItem = strtr(
-                    $subItem,
-                    [
-                        '\\' => '\\\\',
-                        ';'  => '\;',
-                        ','  => '\,',
-                        "\n" => '\n',
-                        "\r" => "",
-                    ]
-                );
-            }
-            $item = implode(',', $item);
-
-        }
-
-        return implode($this->delimiter, $val);
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        // Structured text values should always be returned as a single
-        // array-item. Multi-value text should be returned as multiple items in
-        // the top-array.
-        if (in_array($this->name, $this->structuredValues)) {
-            return [$this->getParts()];
-        }
-        return $this->getParts();
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'TEXT';
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        // We need to kick in a special type of encoding, if it's a 2.1 vcard.
-        if ($this->root->getDocumentType() !== Document::VCARD21) {
-            return parent::serialize();
-        }
-
-        $val = $this->getParts();
-
-        if (isset($this->minimumPropertyValues[$this->name])) {
-            $val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
-        }
-
-        // Imploding multiple parts into a single value, and splitting the
-        // values with ;.
-        if (count($val) > 1) {
-            foreach ($val as $k => $v) {
-                $val[$k] = str_replace(';', '\;', $v);
-            }
-            $val = implode(';', $val);
-        } else {
-            $val = $val[0];
-        }
-
-        $str = $this->name;
-        if ($this->group) $str = $this->group . '.' . $this->name;
-        foreach ($this->parameters as $param) {
-
-            if ($param->getValue() === 'QUOTED-PRINTABLE') {
-                continue;
-            }
-            $str .= ';' . $param->serialize();
-
-        }
-
-
-
-        // If the resulting value contains a \n, we must encode it as
-        // quoted-printable.
-        if (strpos($val, "\n") !== false) {
-
-            $str .= ';ENCODING=QUOTED-PRINTABLE:';
-            $lastLine = $str;
-            $out = null;
-
-            // The PHP built-in quoted-printable-encode does not correctly
-            // encode newlines for us. Specifically, the \r\n sequence must in
-            // vcards be encoded as =0D=OA and we must insert soft-newlines
-            // every 75 bytes.
-            for ($ii = 0;$ii < strlen($val);$ii++) {
-                $ord = ord($val[$ii]);
-                // These characters are encoded as themselves.
-                if ($ord >= 32 && $ord <= 126) {
-                    $lastLine .= $val[$ii];
-                } else {
-                    $lastLine .= '=' . strtoupper(bin2hex($val[$ii]));
-                }
-                if (strlen($lastLine) >= 75) {
-                    // Soft line break
-                    $out .= $lastLine . "=\r\n ";
-                    $lastLine = null;
-                }
-
-            }
-            if (!is_null($lastLine)) $out .= $lastLine . "\r\n";
-            return $out;
-
-        } else {
-            $str .= ':' . $val;
-            $out = '';
-            while (strlen($str) > 0) {
-                if (strlen($str) > 75) {
-                    $out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n";
-                    $str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8');
-                } else {
-                    $out .= $str . "\r\n";
-                    $str = '';
-                    break;
-                }
-            }
-
-            return $out;
-
-        }
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        $values = $this->getParts();
-
-        $map = function($items) use ($values, $writer) {
-            foreach ($items as $i => $item) {
-                $writer->writeElement(
-                    $item,
-                    !empty($values[$i]) ? $values[$i] : null
-                );
-            }
-        };
-
-        switch ($this->name) {
-
-            // Special-casing the REQUEST-STATUS property.
-            //
-            // See:
-            // http://tools.ietf.org/html/rfc6321#section-3.4.1.3
-            case 'REQUEST-STATUS':
-                $writer->writeElement('code', $values[0]);
-                $writer->writeElement('description', $values[1]);
-
-                if (isset($values[2])) {
-                    $writer->writeElement('data', $values[2]);
-                }
-                break;
-
-            case 'N':
-                $map([
-                    'surname',
-                    'given',
-                    'additional',
-                    'prefix',
-                    'suffix'
-                ]);
-                break;
-
-            case 'GENDER':
-                $map([
-                    'sex',
-                    'text'
-                ]);
-                break;
-
-            case 'ADR':
-                $map([
-                    'pobox',
-                    'ext',
-                    'street',
-                    'locality',
-                    'region',
-                    'code',
-                    'country'
-                ]);
-                break;
-
-            case 'CLIENTPIDMAP':
-                $map([
-                    'sourceid',
-                    'uri'
-                ]);
-                break;
-
-            default:
-                parent::xmlSerializeValue($writer);
-        }
-
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   - Node::REPAIR - If something is broken, and automatic repair may
-     *                    be attempted.
-     *
-     * An array is returned with warnings.
-     *
-     * Every item in the array has the following properties:
-     *    * level - (number between 1 and 3 with severity information)
-     *    * message - (human readable message)
-     *    * node - (reference to the offending node)
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $warnings = parent::validate($options);
-
-        if (isset($this->minimumPropertyValues[$this->name])) {
-
-            $minimum = $this->minimumPropertyValues[$this->name];
-            $parts = $this->getParts();
-            if (count($parts) < $minimum) {
-                $warnings[] = [
-                    'level'   => $options & self::REPAIR ? 1 : 3,
-                    'message' => 'The ' . $this->name  . ' property must have at least ' . $minimum . ' values. It only has ' . count($parts),
-                    'node'    => $this,
-                ];
-                if ($options & self::REPAIR) {
-                    $parts = array_pad($parts, $minimum, '');
-                    $this->setParts($parts);
-                }
-            }
-
-        }
-        return $warnings;
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string
+	 */
+	public $delimiter = ',';
+
+	/**
+	 * List of properties that are considered 'structured'.
+	 *
+	 * @var array
+	 */
+	protected $structuredValues = [
+		// vCard
+		'N',
+		'ADR',
+		'ORG',
+		'GENDER',
+		'CLIENTPIDMAP',
+
+		// iCalendar
+		'REQUEST-STATUS',
+	];
+
+	/**
+	 * Some text components have a minimum number of components.
+	 *
+	 * N must for instance be represented as 5 components, separated by ;, even
+	 * if the last few components are unused.
+	 *
+	 * @var array
+	 */
+	protected $minimumPropertyValues = [
+		'N'   => 5,
+		'ADR' => 7,
+	];
+
+	/**
+	 * Creates the property.
+	 *
+	 * You can specify the parameters either in key=>value syntax, in which case
+	 * parameters will automatically be created, or you can just pass a list of
+	 * Parameter objects.
+	 *
+	 * @param Component $root The root document
+	 * @param string $name
+	 * @param string|array|null $value
+	 * @param array $parameters List of parameters
+	 * @param string $group The vcard property group
+	 *
+	 * @return void
+	 */
+	public function __construct(Component $root, $name, $value = null, array $parameters = [], $group = null) {
+
+		// There's two types of multi-valued text properties:
+		// 1. multivalue properties.
+		// 2. structured value properties
+		//
+		// The former is always separated by a comma, the latter by semi-colon.
+		if (in_array($name, $this->structuredValues)) {
+			$this->delimiter = ';';
+		}
+
+		parent::__construct($root, $name, $value, $parameters, $group);
+
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue(MimeDir::unescapeValue($val, $this->delimiter));
+
+	}
+
+	/**
+	 * Sets the value as a quoted-printable encoded string.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setQuotedPrintableValue($val) {
+
+		$val = quoted_printable_decode($val);
+
+		// Quoted printable only appears in vCard 2.1, and the only character
+		// that may be escaped there is ;. So we are simply splitting on just
+		// that.
+		//
+		// We also don't have to unescape \\, so all we need to look for is a ;
+		// that's not preceeded with a \.
+		$regex = '# (?<!\\\\) ; #x';
+		$matches = preg_split($regex, $val);
+		$this->setValue($matches);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		$val = $this->getParts();
+
+		if (isset($this->minimumPropertyValues[$this->name])) {
+			$val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
+		}
+
+		foreach ($val as &$item) {
+
+			if (!is_array($item)) {
+				$item = [$item];
+			}
+
+			foreach ($item as &$subItem) {
+				$subItem = strtr(
+					$subItem,
+					[
+						'\\' => '\\\\',
+						';'  => '\;',
+						','  => '\,',
+						"\n" => '\n',
+						"\r" => "",
+					]
+				);
+			}
+			$item = implode(',', $item);
+
+		}
+
+		return implode($this->delimiter, $val);
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		// Structured text values should always be returned as a single
+		// array-item. Multi-value text should be returned as multiple items in
+		// the top-array.
+		if (in_array($this->name, $this->structuredValues)) {
+			return [$this->getParts()];
+		}
+		return $this->getParts();
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'TEXT';
+
+	}
+
+	/**
+	 * Turns the object back into a serialized blob.
+	 *
+	 * @return string
+	 */
+	public function serialize() {
+
+		// We need to kick in a special type of encoding, if it's a 2.1 vcard.
+		if ($this->root->getDocumentType() !== Document::VCARD21) {
+			return parent::serialize();
+		}
+
+		$val = $this->getParts();
+
+		if (isset($this->minimumPropertyValues[$this->name])) {
+			$val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
+		}
+
+		// Imploding multiple parts into a single value, and splitting the
+		// values with ;.
+		if (count($val) > 1) {
+			foreach ($val as $k => $v) {
+				$val[$k] = str_replace(';', '\;', $v);
+			}
+			$val = implode(';', $val);
+		} else {
+			$val = $val[0];
+		}
+
+		$str = $this->name;
+		if ($this->group) $str = $this->group . '.' . $this->name;
+		foreach ($this->parameters as $param) {
+
+			if ($param->getValue() === 'QUOTED-PRINTABLE') {
+				continue;
+			}
+			$str .= ';' . $param->serialize();
+
+		}
+
+
+
+		// If the resulting value contains a \n, we must encode it as
+		// quoted-printable.
+		if (strpos($val, "\n") !== false) {
+
+			$str .= ';ENCODING=QUOTED-PRINTABLE:';
+			$lastLine = $str;
+			$out = null;
+
+			// The PHP built-in quoted-printable-encode does not correctly
+			// encode newlines for us. Specifically, the \r\n sequence must in
+			// vcards be encoded as =0D=OA and we must insert soft-newlines
+			// every 75 bytes.
+			for ($ii = 0;$ii < strlen($val);$ii++) {
+				$ord = ord($val[$ii]);
+				// These characters are encoded as themselves.
+				if ($ord >= 32 && $ord <= 126) {
+					$lastLine .= $val[$ii];
+				} else {
+					$lastLine .= '=' . strtoupper(bin2hex($val[$ii]));
+				}
+				if (strlen($lastLine) >= 75) {
+					// Soft line break
+					$out .= $lastLine . "=\r\n ";
+					$lastLine = null;
+				}
+
+			}
+			if (!is_null($lastLine)) $out .= $lastLine . "\r\n";
+			return $out;
+
+		} else {
+			$str .= ':' . $val;
+			$out = '';
+			while (strlen($str) > 0) {
+				if (strlen($str) > 75) {
+					$out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n";
+					$str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8');
+				} else {
+					$out .= $str . "\r\n";
+					$str = '';
+					break;
+				}
+			}
+
+			return $out;
+
+		}
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		$values = $this->getParts();
+
+		$map = function($items) use ($values, $writer) {
+			foreach ($items as $i => $item) {
+				$writer->writeElement(
+					$item,
+					!empty($values[$i]) ? $values[$i] : null
+				);
+			}
+		};
+
+		switch ($this->name) {
+
+			// Special-casing the REQUEST-STATUS property.
+			//
+			// See:
+			// http://tools.ietf.org/html/rfc6321#section-3.4.1.3
+			case 'REQUEST-STATUS':
+				$writer->writeElement('code', $values[0]);
+				$writer->writeElement('description', $values[1]);
+
+				if (isset($values[2])) {
+					$writer->writeElement('data', $values[2]);
+				}
+				break;
+
+			case 'N':
+				$map([
+					'surname',
+					'given',
+					'additional',
+					'prefix',
+					'suffix'
+				]);
+				break;
+
+			case 'GENDER':
+				$map([
+					'sex',
+					'text'
+				]);
+				break;
+
+			case 'ADR':
+				$map([
+					'pobox',
+					'ext',
+					'street',
+					'locality',
+					'region',
+					'code',
+					'country'
+				]);
+				break;
+
+			case 'CLIENTPIDMAP':
+				$map([
+					'sourceid',
+					'uri'
+				]);
+				break;
+
+			default:
+				parent::xmlSerializeValue($writer);
+		}
+
+	}
+
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   - Node::REPAIR - If something is broken, and automatic repair may
+	 *                    be attempted.
+	 *
+	 * An array is returned with warnings.
+	 *
+	 * Every item in the array has the following properties:
+	 *    * level - (number between 1 and 3 with severity information)
+	 *    * message - (human readable message)
+	 *    * node - (reference to the offending node)
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0) {
+
+		$warnings = parent::validate($options);
+
+		if (isset($this->minimumPropertyValues[$this->name])) {
+
+			$minimum = $this->minimumPropertyValues[$this->name];
+			$parts = $this->getParts();
+			if (count($parts) < $minimum) {
+				$warnings[] = [
+					'level'   => $options & self::REPAIR ? 1 : 3,
+					'message' => 'The ' . $this->name  . ' property must have at least ' . $minimum . ' values. It only has ' . count($parts),
+					'node'    => $this,
+				];
+				if ($options & self::REPAIR) {
+					$parts = array_pad($parts, $minimum, '');
+					$this->setParts($parts);
+				}
+			}
+
+		}
+		return $warnings;
+
+	}
 }

libraries/SabreDAV/VObject/Property/VCard/TimeStamp.php

Indentation +66 added lines, -66 removed lines

@@ -17,70 +17,70 @@
  */
 class TimeStamp extends Text {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = null;
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'TIMESTAMP';
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $parts = DateTimeParser::parseVCardDateTime($this->getValue());
-
-        $dateStr =
-            $parts['year'] . '-' .
-            $parts['month'] . '-' .
-            $parts['date'] . 'T' .
-            $parts['hour'] . ':' .
-            $parts['minute'] . ':' .
-            $parts['second'];
-
-        // Timezone
-        if (!is_null($parts['timezone'])) {
-            $dateStr .= $parts['timezone'];
-        }
-
-        return [$dateStr];
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        // xCard is the only XML and JSON format that has the same date and time
-        // format than vCard.
-        $valueType = strtolower($this->getValueType());
-        $writer->writeElement($valueType, $this->getValue());
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = null;
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'TIMESTAMP';
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		$parts = DateTimeParser::parseVCardDateTime($this->getValue());
+
+		$dateStr =
+			$parts['year'] . '-' .
+			$parts['month'] . '-' .
+			$parts['date'] . 'T' .
+			$parts['hour'] . ':' .
+			$parts['minute'] . ':' .
+			$parts['second'];
+
+		// Timezone
+		if (!is_null($parts['timezone'])) {
+			$dateStr .= $parts['timezone'];
+		}
+
+		return [$dateStr];
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		// xCard is the only XML and JSON format that has the same date and time
+		// format than vCard.
+		$valueType = strtolower($this->getValueType());
+		$writer->writeElement($valueType, $this->getValue());
+
+	}
 }

libraries/SabreDAV/VObject/Property/VCard/LanguageTag.php

Indentation +41 added lines, -41 removed lines

@@ -3,7 +3,7 @@ 
 namespace Sabre\VObject\Property\VCard;
 
 use
-    Sabre\VObject\Property;
+	Sabre\VObject\Property;
 
 /**
  * LanguageTag property.
@@ -16,45 +16,45 @@ 
  */
 class LanguageTag extends Property {
 
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue($val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return $this->getValue();
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'LANGUAGE-TAG';
-
-    }
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue($val);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return $this->getValue();
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'LANGUAGE-TAG';
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/VCard/DateAndOrTime.php

Indentation +379 added lines, -379 removed lines

@@ -21,383 +21,383 @@
  */
 class DateAndOrTime extends Property {
 
-    /**
-     * Field separator.
-     *
-     * @var null|string
-     */
-    public $delimiter = null;
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'DATE-AND-OR-TIME';
-
-    }
-
-    /**
-     * Sets a multi-valued property.
-     *
-     * You may also specify DateTime objects here.
-     *
-     * @param array $parts
-     *
-     * @return void
-     */
-    public function setParts(array $parts) {
-
-        if (count($parts) > 1) {
-            throw new \InvalidArgumentException('Only one value allowed');
-        }
-        if (isset($parts[0]) && $parts[0] instanceof \DateTime) {
-            $this->setDateTime($parts[0]);
-        } else {
-            parent::setParts($parts);
-        }
-
-    }
-
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * Instead of strings, you may also use DateTime here.
-     *
-     * @param string|array|\DateTime $value
-     *
-     * @return void
-     */
-    public function setValue($value) {
-
-        if ($value instanceof \DateTime) {
-            $this->setDateTime($value);
-        } else {
-            parent::setValue($value);
-        }
-
-    }
-
-    /**
-     * Sets the property as a DateTime object.
-     *
-     * @param DateTimeInterface $dt
-     *
-     * @return void
-     */
-    public function setDateTime(DateTimeInterface $dt) {
-
-        $tz = $dt->getTimeZone();
-        $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
-
-        if ($isUtc) {
-            $value = $dt->format('Ymd\\THis\\Z');
-        } else {
-            // Calculating the offset.
-            $value = $dt->format('Ymd\\THisO');
-        }
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns a date-time value.
-     *
-     * Note that if this property contained more than 1 date-time, only the
-     * first will be returned. To get an array with multiple values, call
-     * getDateTimes.
-     *
-     * If no time was specified, we will always use midnight (in the default
-     * timezone) as the time.
-     *
-     * If parts of the date were omitted, such as the year, we will grab the
-     * current values for those. So at the time of writing, if the year was
-     * omitted, we would have filled in 2014.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDateTime() {
-
-        $now = new DateTime();
-
-        $tzFormat = $now->getTimezone()->getOffset($now) === 0 ? '\\Z' : 'O';
-        $nowParts = DateTimeParser::parseVCardDateTime($now->format('Ymd\\This' . $tzFormat));
-
-        $dateParts = DateTimeParser::parseVCardDateTime($this->getValue());
-
-        // This sets all the missing parts to the current date/time.
-        // So if the year was missing for a birthday, we're making it 'this
-        // year'.
-        foreach ($dateParts as $k => $v) {
-            if (is_null($v)) {
-                $dateParts[$k] = $nowParts[$k];
-            }
-        }
-        return new DateTimeImmutable("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $parts = DateTimeParser::parseVCardDateTime($this->getValue());
-
-        $dateStr = '';
-
-        // Year
-        if (!is_null($parts['year'])) {
-
-            $dateStr .= $parts['year'];
-
-            if (!is_null($parts['month'])) {
-                // If a year and a month is set, we need to insert a separator
-                // dash.
-                $dateStr .= '-';
-            }
-
-        } else {
-
-            if (!is_null($parts['month']) || !is_null($parts['date'])) {
-                // Inserting two dashes
-                $dateStr .= '--';
-            }
-
-        }
-
-        // Month
-        if (!is_null($parts['month'])) {
-
-            $dateStr .= $parts['month'];
-
-            if (isset($parts['date'])) {
-                // If month and date are set, we need the separator dash.
-                $dateStr .= '-';
-            }
-
-        } elseif (isset($parts['date'])) {
-            // If the month is empty, and a date is set, we need a 'empty
-            // dash'
-            $dateStr .= '-';
-        }
-
-        // Date
-        if (!is_null($parts['date'])) {
-            $dateStr .= $parts['date'];
-        }
-
-
-        // Early exit if we don't have a time string.
-        if (is_null($parts['hour']) && is_null($parts['minute']) && is_null($parts['second'])) {
-            return [$dateStr];
-        }
-
-        $dateStr .= 'T';
-
-        // Hour
-        if (!is_null($parts['hour'])) {
-
-            $dateStr .= $parts['hour'];
-
-            if (!is_null($parts['minute'])) {
-                $dateStr .= ':';
-            }
-
-        } else {
-            // We know either minute or second _must_ be set, so we insert a
-            // dash for an empty value.
-            $dateStr .= '-';
-        }
-
-        // Minute
-        if (!is_null($parts['minute'])) {
-
-            $dateStr .= $parts['minute'];
-
-            if (!is_null($parts['second'])) {
-                $dateStr .= ':';
-            }
-
-        } elseif (isset($parts['second'])) {
-            // Dash for empty minute
-            $dateStr .= '-';
-        }
-
-        // Second
-        if (!is_null($parts['second'])) {
-            $dateStr .= $parts['second'];
-        }
-
-        // Timezone
-        if (!is_null($parts['timezone'])) {
-            $dateStr .= $parts['timezone'];
-        }
-
-        return [$dateStr];
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        $valueType = strtolower($this->getValueType());
-        $parts     = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
-        $value     = '';
-
-        $d = function($part) use ($parts) {
-            return !is_null($parts[$part]);
-        };
-
-        $r = function($part) use ($parts) {
-            return $parts[$part];
-        };
-
-        // From the Relax NG Schema.
-        //
-        // # 4.3.1
-        // value-date = element date {
-        //     xsd:string { pattern = "\d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d" }
-        //   }
-        if (($d('year') ||  $d('month')  ||  $d('date'))
-            && (!$d('hour') && !$d('minute') && !$d('second') && !$d('timezone'))) {
-
-            if ($d('year') && $d('month') && $d('date')) {
-                $value .= $r('year') . $r('month') . $r('date');
-            } elseif ($d('year') && $d('month') && !$d('date')) {
-                $value .= $r('year') . '-' . $r('month');
-            } elseif (!$d('year') && $d('month')) {
-                $value .= '--' . $r('month') . $r('date');
-            } elseif (!$d('year') && !$d('month') && $d('date')) {
-                $value .= '---' . $r('date');
-            }
-
-        // # 4.3.2
-        // value-time = element time {
-        //     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
-        //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
-        //   }
-        } elseif ((!$d('year') && !$d('month')  && !$d('date'))
-                  && ($d('hour') ||  $d('minute') ||  $d('second'))) {
-
-            if ($d('hour')) {
-                $value .= $r('hour') . $r('minute') . $r('second');
-            } elseif ($d('minute')) {
-                $value .= '-' . $r('minute') . $r('second');
-            } elseif ($d('second')) {
-                $value .= '--' . $r('second');
-            }
-
-            $value .= $r('timezone');
-
-        // # 4.3.3
-        // value-date-time = element date-time {
-        //     xsd:string { pattern = "(\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?"
-        //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
-        //   }
-        } elseif ($d('date') && $d('hour')) {
-
-            if ($d('year') && $d('month') && $d('date')) {
-                $value .= $r('year') . $r('month') . $r('date');
-            } elseif (!$d('year') && $d('month') && $d('date')) {
-                $value .= '--' . $r('month') . $r('date');
-            } elseif (!$d('year') && !$d('month') && $d('date')) {
-                $value .= '---' . $r('date');
-            }
-
-            $value .= 'T' . $r('hour') . $r('minute') . $r('second') .
-                      $r('timezone');
-
-        }
-
-        $writer->writeElement($valueType, $value);
-
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue($val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode($this->delimiter, $this->getParts());
-
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   Node::REPAIR - May attempt to automatically repair the problem.
-     *
-     * This method returns an array with detected problems.
-     * Every element has the following properties:
-     *
-     *  * level - problem level.
-     *  * message - A human-readable string describing the issue.
-     *  * node - A reference to the problematic node.
-     *
-     * The level means:
-     *   1 - The issue was repaired (only happens if REPAIR was turned on)
-     *   2 - An inconsequential issue
-     *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $messages = parent::validate($options);
-        $value = $this->getValue();
-
-        try {
-            DateTimeParser::parseVCardDateTime($value);
-        } catch (InvalidDataException $e) {
-            $messages[] = [
-                'level'   => 3,
-                'message' => 'The supplied value (' . $value . ') is not a correct DATE-AND-OR-TIME property',
-                'node'    => $this,
-            ];
-        }
-
-        return $messages;
-
-    }
+	/**
+	 * Field separator.
+	 *
+	 * @var null|string
+	 */
+	public $delimiter = null;
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'DATE-AND-OR-TIME';
+
+	}
+
+	/**
+	 * Sets a multi-valued property.
+	 *
+	 * You may also specify DateTime objects here.
+	 *
+	 * @param array $parts
+	 *
+	 * @return void
+	 */
+	public function setParts(array $parts) {
+
+		if (count($parts) > 1) {
+			throw new \InvalidArgumentException('Only one value allowed');
+		}
+		if (isset($parts[0]) && $parts[0] instanceof \DateTime) {
+			$this->setDateTime($parts[0]);
+		} else {
+			parent::setParts($parts);
+		}
+
+	}
+
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * Instead of strings, you may also use DateTime here.
+	 *
+	 * @param string|array|\DateTime $value
+	 *
+	 * @return void
+	 */
+	public function setValue($value) {
+
+		if ($value instanceof \DateTime) {
+			$this->setDateTime($value);
+		} else {
+			parent::setValue($value);
+		}
+
+	}
+
+	/**
+	 * Sets the property as a DateTime object.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return void
+	 */
+	public function setDateTime(DateTimeInterface $dt) {
+
+		$tz = $dt->getTimeZone();
+		$isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
+
+		if ($isUtc) {
+			$value = $dt->format('Ymd\\THis\\Z');
+		} else {
+			// Calculating the offset.
+			$value = $dt->format('Ymd\\THisO');
+		}
+
+		$this->value = $value;
+
+	}
+
+	/**
+	 * Returns a date-time value.
+	 *
+	 * Note that if this property contained more than 1 date-time, only the
+	 * first will be returned. To get an array with multiple values, call
+	 * getDateTimes.
+	 *
+	 * If no time was specified, we will always use midnight (in the default
+	 * timezone) as the time.
+	 *
+	 * If parts of the date were omitted, such as the year, we will grab the
+	 * current values for those. So at the time of writing, if the year was
+	 * omitted, we would have filled in 2014.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDateTime() {
+
+		$now = new DateTime();
+
+		$tzFormat = $now->getTimezone()->getOffset($now) === 0 ? '\\Z' : 'O';
+		$nowParts = DateTimeParser::parseVCardDateTime($now->format('Ymd\\This' . $tzFormat));
+
+		$dateParts = DateTimeParser::parseVCardDateTime($this->getValue());
+
+		// This sets all the missing parts to the current date/time.
+		// So if the year was missing for a birthday, we're making it 'this
+		// year'.
+		foreach ($dateParts as $k => $v) {
+			if (is_null($v)) {
+				$dateParts[$k] = $nowParts[$k];
+			}
+		}
+		return new DateTimeImmutable("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		$parts = DateTimeParser::parseVCardDateTime($this->getValue());
+
+		$dateStr = '';
+
+		// Year
+		if (!is_null($parts['year'])) {
+
+			$dateStr .= $parts['year'];
+
+			if (!is_null($parts['month'])) {
+				// If a year and a month is set, we need to insert a separator
+				// dash.
+				$dateStr .= '-';
+			}
+
+		} else {
+
+			if (!is_null($parts['month']) || !is_null($parts['date'])) {
+				// Inserting two dashes
+				$dateStr .= '--';
+			}
+
+		}
+
+		// Month
+		if (!is_null($parts['month'])) {
+
+			$dateStr .= $parts['month'];
+
+			if (isset($parts['date'])) {
+				// If month and date are set, we need the separator dash.
+				$dateStr .= '-';
+			}
+
+		} elseif (isset($parts['date'])) {
+			// If the month is empty, and a date is set, we need a 'empty
+			// dash'
+			$dateStr .= '-';
+		}
+
+		// Date
+		if (!is_null($parts['date'])) {
+			$dateStr .= $parts['date'];
+		}
+
+
+		// Early exit if we don't have a time string.
+		if (is_null($parts['hour']) && is_null($parts['minute']) && is_null($parts['second'])) {
+			return [$dateStr];
+		}
+
+		$dateStr .= 'T';
+
+		// Hour
+		if (!is_null($parts['hour'])) {
+
+			$dateStr .= $parts['hour'];
+
+			if (!is_null($parts['minute'])) {
+				$dateStr .= ':';
+			}
+
+		} else {
+			// We know either minute or second _must_ be set, so we insert a
+			// dash for an empty value.
+			$dateStr .= '-';
+		}
+
+		// Minute
+		if (!is_null($parts['minute'])) {
+
+			$dateStr .= $parts['minute'];
+
+			if (!is_null($parts['second'])) {
+				$dateStr .= ':';
+			}
+
+		} elseif (isset($parts['second'])) {
+			// Dash for empty minute
+			$dateStr .= '-';
+		}
+
+		// Second
+		if (!is_null($parts['second'])) {
+			$dateStr .= $parts['second'];
+		}
+
+		// Timezone
+		if (!is_null($parts['timezone'])) {
+			$dateStr .= $parts['timezone'];
+		}
+
+		return [$dateStr];
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		$valueType = strtolower($this->getValueType());
+		$parts     = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
+		$value     = '';
+
+		$d = function($part) use ($parts) {
+			return !is_null($parts[$part]);
+		};
+
+		$r = function($part) use ($parts) {
+			return $parts[$part];
+		};
+
+		// From the Relax NG Schema.
+		//
+		// # 4.3.1
+		// value-date = element date {
+		//     xsd:string { pattern = "\d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d" }
+		//   }
+		if (($d('year') ||  $d('month')  ||  $d('date'))
+			&& (!$d('hour') && !$d('minute') && !$d('second') && !$d('timezone'))) {
+
+			if ($d('year') && $d('month') && $d('date')) {
+				$value .= $r('year') . $r('month') . $r('date');
+			} elseif ($d('year') && $d('month') && !$d('date')) {
+				$value .= $r('year') . '-' . $r('month');
+			} elseif (!$d('year') && $d('month')) {
+				$value .= '--' . $r('month') . $r('date');
+			} elseif (!$d('year') && !$d('month') && $d('date')) {
+				$value .= '---' . $r('date');
+			}
+
+		// # 4.3.2
+		// value-time = element time {
+		//     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
+		//                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
+		//   }
+		} elseif ((!$d('year') && !$d('month')  && !$d('date'))
+				  && ($d('hour') ||  $d('minute') ||  $d('second'))) {
+
+			if ($d('hour')) {
+				$value .= $r('hour') . $r('minute') . $r('second');
+			} elseif ($d('minute')) {
+				$value .= '-' . $r('minute') . $r('second');
+			} elseif ($d('second')) {
+				$value .= '--' . $r('second');
+			}
+
+			$value .= $r('timezone');
+
+		// # 4.3.3
+		// value-date-time = element date-time {
+		//     xsd:string { pattern = "(\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?"
+		//                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
+		//   }
+		} elseif ($d('date') && $d('hour')) {
+
+			if ($d('year') && $d('month') && $d('date')) {
+				$value .= $r('year') . $r('month') . $r('date');
+			} elseif (!$d('year') && $d('month') && $d('date')) {
+				$value .= '--' . $r('month') . $r('date');
+			} elseif (!$d('year') && !$d('month') && $d('date')) {
+				$value .= '---' . $r('date');
+			}
+
+			$value .= 'T' . $r('hour') . $r('minute') . $r('second') .
+					  $r('timezone');
+
+		}
+
+		$writer->writeElement($valueType, $value);
+
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue($val);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return implode($this->delimiter, $this->getParts());
+
+	}
+
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   Node::REPAIR - May attempt to automatically repair the problem.
+	 *
+	 * This method returns an array with detected problems.
+	 * Every element has the following properties:
+	 *
+	 *  * level - problem level.
+	 *  * message - A human-readable string describing the issue.
+	 *  * node - A reference to the problematic node.
+	 *
+	 * The level means:
+	 *   1 - The issue was repaired (only happens if REPAIR was turned on)
+	 *   2 - An inconsequential issue
+	 *   3 - A severe issue.
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0) {
+
+		$messages = parent::validate($options);
+		$value = $this->getValue();
+
+		try {
+			DateTimeParser::parseVCardDateTime($value);
+		} catch (InvalidDataException $e) {
+			$messages[] = [
+				'level'   => 3,
+				'message' => 'The supplied value (' . $value . ') is not a correct DATE-AND-OR-TIME property',
+				'node'    => $this,
+			];
+		}
+
+		return $messages;
+
+	}
 }