Dolibarr / dolibarr

htdocs/includes/sabre/sabre/vobject/lib/Property/FlatText.php

Indentation +18 added lines, -18 removed lines

@@ -24,23 +24,23 @@
  */
 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
-     */
-    public function setQuotedPrintableValue($val)
-    {
-        $val = quoted_printable_decode($val);
-        $this->setValue($val);
-    }
+	/**
+	 * Sets the value as a quoted-printable encoded string.
+	 *
+	 * Overriding this so we're not splitting on a ; delimiter.
+	 *
+	 * @param string $val
+	 */
+	public function setQuotedPrintableValue($val)
+	{
+		$val = quoted_printable_decode($val);
+		$this->setValue($val);
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Property/FloatValue.php

Indentation +95 added lines, -95 removed lines

@@ -17,108 +17,108 @@
  */
 class FloatValue extends Property
 {
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string
-     */
-    public $delimiter = ';';
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string
+	 */
+	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
-     */
-    public function setRawMimeDirValue($val)
-    {
-        $val = explode($this->delimiter, $val);
-        foreach ($val as &$item) {
-            $item = (float) $item;
-        }
-        $this->setParts($val);
-    }
+	/**
+	 * 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
+	 */
+	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 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 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());
+	/**
+	 * 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 ('GEO' === $this->name) {
-            return [$val];
-        }
+		// Special-casing the GEO property.
+		//
+		// See:
+		// http://tools.ietf.org/html/draft-ietf-jcardcal-jcal-04#section-3.4.1.2
+		if ('GEO' === $this->name) {
+			return [$val];
+		}
 
-        return $val;
-    }
+		return $val;
+	}
 
-    /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
-     * object.
-     */
-    public function setXmlValue(array $value)
-    {
-        $value = array_map('floatval', $value);
-        parent::setXmlValue($value);
-    }
+	/**
+	 * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+	 * object.
+	 */
+	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
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer)
-    {
-        // Special-casing the GEO property.
-        //
-        // See:
-        // http://tools.ietf.org/html/rfc6321#section-3.4.1.2
-        if ('GEO' === $this->name) {
-            $value = array_map('floatval', $this->getParts());
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer XML writer
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer)
+	{
+		// Special-casing the GEO property.
+		//
+		// See:
+		// http://tools.ietf.org/html/rfc6321#section-3.4.1.2
+		if ('GEO' === $this->name) {
+			$value = array_map('floatval', $this->getParts());
 
-            $writer->writeElement('latitude', $value[0]);
-            $writer->writeElement('longitude', $value[1]);
-        } else {
-            parent::xmlSerializeValue($writer);
-        }
-    }
+			$writer->writeElement('latitude', $value[0]);
+			$writer->writeElement('longitude', $value[1]);
+		} else {
+			parent::xmlSerializeValue($writer);
+		}
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Parser/XML.php

Indentation +354 added lines, -354 removed lines

@@ -20,358 +20,358 @@
  */
 class XML extends Parser
 {
-    const XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0';
-    const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
-
-    /**
-     * The input data.
-     *
-     * @var array
-     */
-    protected $input;
-
-    /**
-     * A pointer/reference to the input.
-     *
-     * @var array
-     */
-    private $pointer;
-
-    /**
-     * Document, root component.
-     *
-     * @var \Sabre\VObject\Document
-     */
-    protected $root;
-
-    /**
-     * Creates the parser.
-     *
-     * Optionally, it's possible to parse the input stream here.
-     *
-     * @param mixed $input
-     * @param int   $options any parser options (OPTION constants)
-     */
-    public function __construct($input = null, $options = 0)
-    {
-        if (0 === $options) {
-            $options = parent::OPTION_FORGIVING;
-        }
-
-        parent::__construct($input, $options);
-    }
-
-    /**
-     * Parse xCal or xCard.
-     *
-     * @param resource|string $input
-     * @param int             $options
-     *
-     * @throws \Exception
-     *
-     * @return \Sabre\VObject\Document
-     */
-    public function parse($input = null, $options = 0)
-    {
-        if (!is_null($input)) {
-            $this->setInput($input);
-        }
-
-        if (0 !== $options) {
-            $this->options = $options;
-        }
-
-        if (is_null($this->input)) {
-            throw new EofException('End of input stream, or no input supplied');
-        }
-
-        switch ($this->input['name']) {
-            case '{'.self::XCAL_NAMESPACE.'}icalendar':
-                $this->root = new VCalendar([], false);
-                $this->pointer = &$this->input['value'][0];
-                $this->parseVCalendarComponents($this->root);
-                break;
-
-            case '{'.self::XCARD_NAMESPACE.'}vcards':
-                foreach ($this->input['value'] as &$vCard) {
-                    $this->root = new VCard(['version' => '4.0'], false);
-                    $this->pointer = &$vCard;
-                    $this->parseVCardComponents($this->root);
-
-                    // We just parse the first <vcard /> element.
-                    break;
-                }
-                break;
-
-            default:
-                throw new ParseException('Unsupported XML standard');
-        }
-
-        return $this->root;
-    }
-
-    /**
-     * Parse a xCalendar component.
-     */
-    protected function parseVCalendarComponents(Component $parentComponent)
-    {
-        foreach ($this->pointer['value'] ?: [] as $children) {
-            switch (static::getTagName($children['name'])) {
-                case 'properties':
-                    $this->pointer = &$children['value'];
-                    $this->parseProperties($parentComponent);
-                    break;
-
-                case 'components':
-                    $this->pointer = &$children;
-                    $this->parseComponent($parentComponent);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Parse a xCard component.
-     */
-    protected function parseVCardComponents(Component $parentComponent)
-    {
-        $this->pointer = &$this->pointer['value'];
-        $this->parseProperties($parentComponent);
-    }
-
-    /**
-     * Parse xCalendar and xCard properties.
-     *
-     * @param string $propertyNamePrefix
-     */
-    protected function parseProperties(Component $parentComponent, $propertyNamePrefix = '')
-    {
-        foreach ($this->pointer ?: [] as $xmlProperty) {
-            list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
-
-            $propertyName = $tagName;
-            $propertyValue = [];
-            $propertyParameters = [];
-            $propertyType = 'text';
-
-            // A property which is not part of the standard.
-            if (self::XCAL_NAMESPACE !== $namespace
-                && self::XCARD_NAMESPACE !== $namespace) {
-                $propertyName = 'xml';
-                $value = '<'.$tagName.' xmlns="'.$namespace.'"';
-
-                foreach ($xmlProperty['attributes'] as $attributeName => $attributeValue) {
-                    $value .= ' '.$attributeName.'="'.str_replace('"', '\"', $attributeValue).'"';
-                }
-
-                $value .= '>'.$xmlProperty['value'].'</'.$tagName.'>';
-
-                $propertyValue = [$value];
-
-                $this->createProperty(
-                    $parentComponent,
-                    $propertyName,
-                    $propertyParameters,
-                    $propertyType,
-                    $propertyValue
-                );
-
-                continue;
-            }
-
-            // xCard group.
-            if ('group' === $propertyName) {
-                if (!isset($xmlProperty['attributes']['name'])) {
-                    continue;
-                }
-
-                $this->pointer = &$xmlProperty['value'];
-                $this->parseProperties(
-                    $parentComponent,
-                    strtoupper($xmlProperty['attributes']['name']).'.'
-                );
-
-                continue;
-            }
-
-            // Collect parameters.
-            foreach ($xmlProperty['value'] as $i => $xmlPropertyChild) {
-                if (!is_array($xmlPropertyChild)
-                    || 'parameters' !== static::getTagName($xmlPropertyChild['name'])) {
-                    continue;
-                }
-
-                $xmlParameters = $xmlPropertyChild['value'];
-
-                foreach ($xmlParameters as $xmlParameter) {
-                    $propertyParameterValues = [];
-
-                    foreach ($xmlParameter['value'] as $xmlParameterValues) {
-                        $propertyParameterValues[] = $xmlParameterValues['value'];
-                    }
-
-                    $propertyParameters[static::getTagName($xmlParameter['name'])]
-                        = implode(',', $propertyParameterValues);
-                }
-
-                array_splice($xmlProperty['value'], $i, 1);
-            }
-
-            $propertyNameExtended = ($this->root instanceof VCalendar
-                                      ? 'xcal'
-                                      : 'xcard').':'.$propertyName;
-
-            switch ($propertyNameExtended) {
-                case 'xcal:geo':
-                    $propertyType = 'float';
-                    $propertyValue['latitude'] = 0;
-                    $propertyValue['longitude'] = 0;
-
-                    foreach ($xmlProperty['value'] as $xmlRequestChild) {
-                        $propertyValue[static::getTagName($xmlRequestChild['name'])]
-                            = $xmlRequestChild['value'];
-                    }
-                    break;
-
-                case 'xcal:request-status':
-                    $propertyType = 'text';
-
-                    foreach ($xmlProperty['value'] as $xmlRequestChild) {
-                        $propertyValue[static::getTagName($xmlRequestChild['name'])]
-                            = $xmlRequestChild['value'];
-                    }
-                    break;
-
-                case 'xcal:freebusy':
-                    $propertyType = 'freebusy';
-                    // We don't break because we only want to set
-                    // another property type.
-
-                    // no break
-                case 'xcal:categories':
-                case 'xcal:resources':
-                case 'xcal:exdate':
-                    foreach ($xmlProperty['value'] as $specialChild) {
-                        $propertyValue[static::getTagName($specialChild['name'])]
-                            = $specialChild['value'];
-                    }
-                    break;
-
-                case 'xcal:rdate':
-                    $propertyType = 'date-time';
-
-                    foreach ($xmlProperty['value'] as $specialChild) {
-                        $tagName = static::getTagName($specialChild['name']);
-
-                        if ('period' === $tagName) {
-                            $propertyParameters['value'] = 'PERIOD';
-                            $propertyValue[] = implode('/', $specialChild['value']);
-                        } else {
-                            $propertyValue[] = $specialChild['value'];
-                        }
-                    }
-                    break;
-
-                default:
-                    $propertyType = static::getTagName($xmlProperty['value'][0]['name']);
-
-                    foreach ($xmlProperty['value'] as $value) {
-                        $propertyValue[] = $value['value'];
-                    }
-
-                    if ('date' === $propertyType) {
-                        $propertyParameters['value'] = 'DATE';
-                    }
-                    break;
-            }
-
-            $this->createProperty(
-                $parentComponent,
-                $propertyNamePrefix.$propertyName,
-                $propertyParameters,
-                $propertyType,
-                $propertyValue
-            );
-        }
-    }
-
-    /**
-     * Parse a component.
-     */
-    protected function parseComponent(Component $parentComponent)
-    {
-        $components = $this->pointer['value'] ?: [];
-
-        foreach ($components as $component) {
-            $componentName = static::getTagName($component['name']);
-            $currentComponent = $this->root->createComponent(
-                $componentName,
-                null,
-                false
-            );
-
-            $this->pointer = &$component;
-            $this->parseVCalendarComponents($currentComponent);
-
-            $parentComponent->add($currentComponent);
-        }
-    }
-
-    /**
-     * Create a property.
-     *
-     * @param string $name
-     * @param array  $parameters
-     * @param string $type
-     * @param mixed  $value
-     */
-    protected function createProperty(Component $parentComponent, $name, $parameters, $type, $value)
-    {
-        $property = $this->root->createProperty(
-            $name,
-            null,
-            $parameters,
-            $type
-        );
-        $parentComponent->add($property);
-        $property->setXmlValue($value);
-    }
-
-    /**
-     * Sets the input data.
-     *
-     * @param resource|string $input
-     */
-    public function setInput($input)
-    {
-        if (is_resource($input)) {
-            $input = stream_get_contents($input);
-        }
-
-        if (is_string($input)) {
-            $reader = new SabreXml\Reader();
-            $reader->elementMap['{'.self::XCAL_NAMESPACE.'}period']
-                = XML\Element\KeyValue::class;
-            $reader->elementMap['{'.self::XCAL_NAMESPACE.'}recur']
-                = XML\Element\KeyValue::class;
-            $reader->xml($input);
-            $input = $reader->parse();
-        }
-
-        $this->input = $input;
-    }
-
-    /**
-     * Get tag name from a Clark notation.
-     *
-     * @param string $clarkedTagName
-     *
-     * @return string
-     */
-    protected static function getTagName($clarkedTagName)
-    {
-        list(, $tagName) = SabreXml\Service::parseClarkNotation($clarkedTagName);
-
-        return $tagName;
-    }
+	const XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0';
+	const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
+
+	/**
+	 * The input data.
+	 *
+	 * @var array
+	 */
+	protected $input;
+
+	/**
+	 * A pointer/reference to the input.
+	 *
+	 * @var array
+	 */
+	private $pointer;
+
+	/**
+	 * Document, root component.
+	 *
+	 * @var \Sabre\VObject\Document
+	 */
+	protected $root;
+
+	/**
+	 * Creates the parser.
+	 *
+	 * Optionally, it's possible to parse the input stream here.
+	 *
+	 * @param mixed $input
+	 * @param int   $options any parser options (OPTION constants)
+	 */
+	public function __construct($input = null, $options = 0)
+	{
+		if (0 === $options) {
+			$options = parent::OPTION_FORGIVING;
+		}
+
+		parent::__construct($input, $options);
+	}
+
+	/**
+	 * Parse xCal or xCard.
+	 *
+	 * @param resource|string $input
+	 * @param int             $options
+	 *
+	 * @throws \Exception
+	 *
+	 * @return \Sabre\VObject\Document
+	 */
+	public function parse($input = null, $options = 0)
+	{
+		if (!is_null($input)) {
+			$this->setInput($input);
+		}
+
+		if (0 !== $options) {
+			$this->options = $options;
+		}
+
+		if (is_null($this->input)) {
+			throw new EofException('End of input stream, or no input supplied');
+		}
+
+		switch ($this->input['name']) {
+			case '{'.self::XCAL_NAMESPACE.'}icalendar':
+				$this->root = new VCalendar([], false);
+				$this->pointer = &$this->input['value'][0];
+				$this->parseVCalendarComponents($this->root);
+				break;
+
+			case '{'.self::XCARD_NAMESPACE.'}vcards':
+				foreach ($this->input['value'] as &$vCard) {
+					$this->root = new VCard(['version' => '4.0'], false);
+					$this->pointer = &$vCard;
+					$this->parseVCardComponents($this->root);
+
+					// We just parse the first <vcard /> element.
+					break;
+				}
+				break;
+
+			default:
+				throw new ParseException('Unsupported XML standard');
+		}
+
+		return $this->root;
+	}
+
+	/**
+	 * Parse a xCalendar component.
+	 */
+	protected function parseVCalendarComponents(Component $parentComponent)
+	{
+		foreach ($this->pointer['value'] ?: [] as $children) {
+			switch (static::getTagName($children['name'])) {
+				case 'properties':
+					$this->pointer = &$children['value'];
+					$this->parseProperties($parentComponent);
+					break;
+
+				case 'components':
+					$this->pointer = &$children;
+					$this->parseComponent($parentComponent);
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parse a xCard component.
+	 */
+	protected function parseVCardComponents(Component $parentComponent)
+	{
+		$this->pointer = &$this->pointer['value'];
+		$this->parseProperties($parentComponent);
+	}
+
+	/**
+	 * Parse xCalendar and xCard properties.
+	 *
+	 * @param string $propertyNamePrefix
+	 */
+	protected function parseProperties(Component $parentComponent, $propertyNamePrefix = '')
+	{
+		foreach ($this->pointer ?: [] as $xmlProperty) {
+			list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
+
+			$propertyName = $tagName;
+			$propertyValue = [];
+			$propertyParameters = [];
+			$propertyType = 'text';
+
+			// A property which is not part of the standard.
+			if (self::XCAL_NAMESPACE !== $namespace
+				&& self::XCARD_NAMESPACE !== $namespace) {
+				$propertyName = 'xml';
+				$value = '<'.$tagName.' xmlns="'.$namespace.'"';
+
+				foreach ($xmlProperty['attributes'] as $attributeName => $attributeValue) {
+					$value .= ' '.$attributeName.'="'.str_replace('"', '\"', $attributeValue).'"';
+				}
+
+				$value .= '>'.$xmlProperty['value'].'</'.$tagName.'>';
+
+				$propertyValue = [$value];
+
+				$this->createProperty(
+					$parentComponent,
+					$propertyName,
+					$propertyParameters,
+					$propertyType,
+					$propertyValue
+				);
+
+				continue;
+			}
+
+			// xCard group.
+			if ('group' === $propertyName) {
+				if (!isset($xmlProperty['attributes']['name'])) {
+					continue;
+				}
+
+				$this->pointer = &$xmlProperty['value'];
+				$this->parseProperties(
+					$parentComponent,
+					strtoupper($xmlProperty['attributes']['name']).'.'
+				);
+
+				continue;
+			}
+
+			// Collect parameters.
+			foreach ($xmlProperty['value'] as $i => $xmlPropertyChild) {
+				if (!is_array($xmlPropertyChild)
+					|| 'parameters' !== static::getTagName($xmlPropertyChild['name'])) {
+					continue;
+				}
+
+				$xmlParameters = $xmlPropertyChild['value'];
+
+				foreach ($xmlParameters as $xmlParameter) {
+					$propertyParameterValues = [];
+
+					foreach ($xmlParameter['value'] as $xmlParameterValues) {
+						$propertyParameterValues[] = $xmlParameterValues['value'];
+					}
+
+					$propertyParameters[static::getTagName($xmlParameter['name'])]
+						= implode(',', $propertyParameterValues);
+				}
+
+				array_splice($xmlProperty['value'], $i, 1);
+			}
+
+			$propertyNameExtended = ($this->root instanceof VCalendar
+									  ? 'xcal'
+									  : 'xcard').':'.$propertyName;
+
+			switch ($propertyNameExtended) {
+				case 'xcal:geo':
+					$propertyType = 'float';
+					$propertyValue['latitude'] = 0;
+					$propertyValue['longitude'] = 0;
+
+					foreach ($xmlProperty['value'] as $xmlRequestChild) {
+						$propertyValue[static::getTagName($xmlRequestChild['name'])]
+							= $xmlRequestChild['value'];
+					}
+					break;
+
+				case 'xcal:request-status':
+					$propertyType = 'text';
+
+					foreach ($xmlProperty['value'] as $xmlRequestChild) {
+						$propertyValue[static::getTagName($xmlRequestChild['name'])]
+							= $xmlRequestChild['value'];
+					}
+					break;
+
+				case 'xcal:freebusy':
+					$propertyType = 'freebusy';
+					// We don't break because we only want to set
+					// another property type.
+
+					// no break
+				case 'xcal:categories':
+				case 'xcal:resources':
+				case 'xcal:exdate':
+					foreach ($xmlProperty['value'] as $specialChild) {
+						$propertyValue[static::getTagName($specialChild['name'])]
+							= $specialChild['value'];
+					}
+					break;
+
+				case 'xcal:rdate':
+					$propertyType = 'date-time';
+
+					foreach ($xmlProperty['value'] as $specialChild) {
+						$tagName = static::getTagName($specialChild['name']);
+
+						if ('period' === $tagName) {
+							$propertyParameters['value'] = 'PERIOD';
+							$propertyValue[] = implode('/', $specialChild['value']);
+						} else {
+							$propertyValue[] = $specialChild['value'];
+						}
+					}
+					break;
+
+				default:
+					$propertyType = static::getTagName($xmlProperty['value'][0]['name']);
+
+					foreach ($xmlProperty['value'] as $value) {
+						$propertyValue[] = $value['value'];
+					}
+
+					if ('date' === $propertyType) {
+						$propertyParameters['value'] = 'DATE';
+					}
+					break;
+			}
+
+			$this->createProperty(
+				$parentComponent,
+				$propertyNamePrefix.$propertyName,
+				$propertyParameters,
+				$propertyType,
+				$propertyValue
+			);
+		}
+	}
+
+	/**
+	 * Parse a component.
+	 */
+	protected function parseComponent(Component $parentComponent)
+	{
+		$components = $this->pointer['value'] ?: [];
+
+		foreach ($components as $component) {
+			$componentName = static::getTagName($component['name']);
+			$currentComponent = $this->root->createComponent(
+				$componentName,
+				null,
+				false
+			);
+
+			$this->pointer = &$component;
+			$this->parseVCalendarComponents($currentComponent);
+
+			$parentComponent->add($currentComponent);
+		}
+	}
+
+	/**
+	 * Create a property.
+	 *
+	 * @param string $name
+	 * @param array  $parameters
+	 * @param string $type
+	 * @param mixed  $value
+	 */
+	protected function createProperty(Component $parentComponent, $name, $parameters, $type, $value)
+	{
+		$property = $this->root->createProperty(
+			$name,
+			null,
+			$parameters,
+			$type
+		);
+		$parentComponent->add($property);
+		$property->setXmlValue($value);
+	}
+
+	/**
+	 * Sets the input data.
+	 *
+	 * @param resource|string $input
+	 */
+	public function setInput($input)
+	{
+		if (is_resource($input)) {
+			$input = stream_get_contents($input);
+		}
+
+		if (is_string($input)) {
+			$reader = new SabreXml\Reader();
+			$reader->elementMap['{'.self::XCAL_NAMESPACE.'}period']
+				= XML\Element\KeyValue::class;
+			$reader->elementMap['{'.self::XCAL_NAMESPACE.'}recur']
+				= XML\Element\KeyValue::class;
+			$reader->xml($input);
+			$input = $reader->parse();
+		}
+
+		$this->input = $input;
+	}
+
+	/**
+	 * Get tag name from a Clark notation.
+	 *
+	 * @param string $clarkedTagName
+	 *
+	 * @return string
+	 */
+	protected static function getTagName($clarkedTagName)
+	{
+		list(, $tagName) = SabreXml\Service::parseClarkNotation($clarkedTagName);
+
+		return $tagName;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Parser/Json.php

Indentation +166 added lines, -166 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
         $self = $this;
 
         $properties = array_map(
-            function ($jProp) use ($self) {
+            function($jProp) use ($self) {
                 return $self->parseProperty($jProp);
             },
             $jComp[1]
@@ -105,7 +105,7 @@ 
 
         if (isset($jComp[2])) {
             $components = array_map(
-                function ($jComp) use ($self) {
+                function($jComp) use ($self) {
                     return $self->parseComponent($jComp);
                 },
                 $jComp[2]

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

Indentation +54 added lines, -54 removed lines

@@ -13,63 +13,63 @@
  */
 abstract class Parser
 {
-    /**
-     * Turning on this option makes the parser more forgiving.
-     *
-     * In the case of the MimeDir parser, this means that the parser will
-     * accept slashes and underscores in property names, and it will also
-     * attempt to fix Microsoft vCard 2.1's broken line folding.
-     */
-    const OPTION_FORGIVING = 1;
+	/**
+	 * Turning on this option makes the parser more forgiving.
+	 *
+	 * In the case of the MimeDir parser, this means that the parser will
+	 * accept slashes and underscores in property names, and it will also
+	 * attempt to fix Microsoft vCard 2.1's broken line folding.
+	 */
+	const OPTION_FORGIVING = 1;
 
-    /**
-     * If this option is turned on, any lines we cannot parse will be ignored
-     * by the reader.
-     */
-    const OPTION_IGNORE_INVALID_LINES = 2;
+	/**
+	 * If this option is turned on, any lines we cannot parse will be ignored
+	 * by the reader.
+	 */
+	const OPTION_IGNORE_INVALID_LINES = 2;
 
-    /**
-     * Bitmask of parser options.
-     *
-     * @var int
-     */
-    protected $options;
+	/**
+	 * Bitmask of parser options.
+	 *
+	 * @var int
+	 */
+	protected $options;
 
-    /**
-     * Creates the parser.
-     *
-     * Optionally, it's possible to parse the input stream here.
-     *
-     * @param mixed $input
-     * @param int   $options any parser options (OPTION constants)
-     */
-    public function __construct($input = null, $options = 0)
-    {
-        if (!is_null($input)) {
-            $this->setInput($input);
-        }
-        $this->options = $options;
-    }
+	/**
+	 * Creates the parser.
+	 *
+	 * Optionally, it's possible to parse the input stream here.
+	 *
+	 * @param mixed $input
+	 * @param int   $options any parser options (OPTION constants)
+	 */
+	public function __construct($input = null, $options = 0)
+	{
+		if (!is_null($input)) {
+			$this->setInput($input);
+		}
+		$this->options = $options;
+	}
 
-    /**
-     * This method starts the parsing process.
-     *
-     * If the input was not supplied during construction, it's possible to pass
-     * it here instead.
-     *
-     * If either input or options are not supplied, the defaults will be used.
-     *
-     * @param mixed $input
-     * @param int   $options
-     *
-     * @return array
-     */
-    abstract public function parse($input = null, $options = 0);
+	/**
+	 * This method starts the parsing process.
+	 *
+	 * If the input was not supplied during construction, it's possible to pass
+	 * it here instead.
+	 *
+	 * If either input or options are not supplied, the defaults will be used.
+	 *
+	 * @param mixed $input
+	 * @param int   $options
+	 *
+	 * @return array
+	 */
+	abstract public function parse($input = null, $options = 0);
 
-    /**
-     * Sets the input data.
-     *
-     * @param mixed $input
-     */
-    abstract public function setInput($input);
+	/**
+	 * Sets the input data.
+	 *
+	 * @param mixed $input
+	 */
+	abstract public function setInput($input);
 }

htdocs/includes/sabre/sabre/vobject/lib/Parser/MimeDir.php

Indentation +628 added lines, -628 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -619,7 +619,7 @@
         return
             preg_replace_callback(
                 '#(\^(\^|n|\'))#',
-                function ($matches) {
+                function($matches) {
                     switch ($matches[2]) {
                         case 'n':
                             return "\n";

htdocs/includes/sabre/sabre/vobject/lib/Component/VJournal.php

Indentation +75 added lines, -75 removed lines

@@ -16,86 +16,86 @@
  */
 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.
-     *
-     * @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');
-            }
+	/**
+	 * 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.
+	 *
+	 * @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 $start <= $effectiveEnd && $end > $dtstart;
+		}
 
-        return false;
-    }
+		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,
+	/**
+	 * 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' => '?',
+			'CLASS' => '?',
+			'CREATED' => '?',
+			'DTSTART' => '?',
+			'LAST-MODIFIED' => '?',
+			'ORGANIZER' => '?',
+			'RECURRENCE-ID' => '?',
+			'SEQUENCE' => '?',
+			'STATUS' => '?',
+			'SUMMARY' => '?',
+			'URL' => '?',
 
-            'RRULE' => '?',
+			'RRULE' => '?',
 
-            'ATTACH' => '*',
-            'ATTENDEE' => '*',
-            'CATEGORIES' => '*',
-            'COMMENT' => '*',
-            'CONTACT' => '*',
-            'DESCRIPTION' => '*',
-            'EXDATE' => '*',
-            'RELATED-TO' => '*',
-            'RDATE' => '*',
-        ];
-    }
+			'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' => gmdate('Ymd\\THis\\Z'),
-        ];
-    }
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults()
+	{
+		return [
+			'UID' => 'sabre-vobject-'.VObject\UUIDUtil::getUUID(),
+			'DTSTAMP' => gmdate('Ymd\\THis\\Z'),
+		];
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Component/VAvailability.php

Indentation +119 added lines, -119 removed lines

@@ -17,133 +17,133 @@
  */
 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
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
-    {
-        list($effectiveStart, $effectiveEnd) = $this->getEffectiveStartEnd();
+	/**
+	 * 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
+	 *
+	 * @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)
-        ;
-    }
+		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;
+	/**
+	 * 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));
-        }
+		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];
-    }
+		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,
+	/**
+	 * 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' => '?',
+			'BUSYTYPE' => '?',
+			'CLASS' => '?',
+			'CREATED' => '?',
+			'DESCRIPTION' => '?',
+			'DTSTART' => '?',
+			'LAST-MODIFIED' => '?',
+			'ORGANIZER' => '?',
+			'PRIORITY' => '?',
+			'SEQUENCE' => '?',
+			'SUMMARY' => '?',
+			'URL' => '?',
+			'DTEND' => '?',
+			'DURATION' => '?',
 
-            'CATEGORIES' => '*',
-            'COMMENT' => '*',
-            'CONTACT' => '*',
-        ];
-    }
+			'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);
+	/**
+	 * 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,
-            ];
-        }
+		if (isset($this->DTEND) && isset($this->DURATION)) {
+			$result[] = [
+				'level' => 3,
+				'message' => 'DTEND and DURATION cannot both be present',
+				'node' => $this,
+			];
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Component/VCard.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     public static $valueMap = [
         'BINARY' => VObject\Property\Binary::class,
         'BOOLEAN' => VObject\Property\Boolean::class,
-        'CONTENT-ID' => VObject\Property\FlatText::class,   // vCard 2.1 only
+        'CONTENT-ID' => VObject\Property\FlatText::class, // vCard 2.1 only
         'DATE' => VObject\Property\VCard\Date::class,
         'DATE-TIME' => VObject\Property\VCard\DateTime::class,
         'DATE-AND-OR-TIME' => VObject\Property\VCard\DateAndOrTime::class, // vCard only

Indentation +521 added lines, -521 removed lines

@@ -17,525 +17,525 @@
  */
 class VCard extends VObject\Document
 {
-    /**
-     * The default name for this component.
-     *
-     * This should be 'VCALENDAR' or 'VCARD'.
-     *
-     * @var string
-     */
-    public 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
-     */
-    public static $componentMap = [
-        'VCARD' => VCard::class,
-    ];
-
-    /**
-     * List of value-types, and which classes they map to.
-     *
-     * @var array
-     */
-    public static $valueMap = [
-        'BINARY' => VObject\Property\Binary::class,
-        'BOOLEAN' => VObject\Property\Boolean::class,
-        'CONTENT-ID' => VObject\Property\FlatText::class,   // vCard 2.1 only
-        'DATE' => VObject\Property\VCard\Date::class,
-        'DATE-TIME' => VObject\Property\VCard\DateTime::class,
-        'DATE-AND-OR-TIME' => VObject\Property\VCard\DateAndOrTime::class, // vCard only
-        'FLOAT' => VObject\Property\FloatValue::class,
-        'INTEGER' => VObject\Property\IntegerValue::class,
-        'LANGUAGE-TAG' => VObject\Property\VCard\LanguageTag::class,
-        'PHONE-NUMBER' => VObject\Property\VCard\PhoneNumber::class, // vCard 3.0 only
-        'TIMESTAMP' => VObject\Property\VCard\TimeStamp::class,
-        'TEXT' => VObject\Property\Text::class,
-        'TIME' => VObject\Property\Time::class,
-        'UNKNOWN' => VObject\Property\Unknown::class, // jCard / jCal-only.
-        'URI' => VObject\Property\Uri::class,
-        'URL' => VObject\Property\Uri::class, // vCard 2.1 only
-        'UTC-OFFSET' => VObject\Property\UtcOffset::class,
-    ];
-
-    /**
-     * List of properties, and which classes they map to.
-     *
-     * @var array
-     */
-    public static $propertyMap = [
-        // vCard 2.1 properties and up
-        'N' => VObject\Property\Text::class,
-        'FN' => VObject\Property\FlatText::class,
-        'PHOTO' => VObject\Property\Binary::class,
-        'BDAY' => VObject\Property\VCard\DateAndOrTime::class,
-        'ADR' => VObject\Property\Text::class,
-        'LABEL' => VObject\Property\FlatText::class, // Removed in vCard 4.0
-        'TEL' => VObject\Property\FlatText::class,
-        'EMAIL' => VObject\Property\FlatText::class,
-        'MAILER' => VObject\Property\FlatText::class, // Removed in vCard 4.0
-        'GEO' => VObject\Property\FlatText::class,
-        'TITLE' => VObject\Property\FlatText::class,
-        'ROLE' => VObject\Property\FlatText::class,
-        'LOGO' => VObject\Property\Binary::class,
-        // 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
-                                 // not supported at the moment
-        'ORG' => VObject\Property\Text::class,
-        'NOTE' => VObject\Property\FlatText::class,
-        'REV' => VObject\Property\VCard\TimeStamp::class,
-        'SOUND' => VObject\Property\FlatText::class,
-        'URL' => VObject\Property\Uri::class,
-        'UID' => VObject\Property\FlatText::class,
-        'VERSION' => VObject\Property\FlatText::class,
-        'KEY' => VObject\Property\FlatText::class,
-        'TZ' => VObject\Property\Text::class,
-
-        // vCard 3.0 properties
-        'CATEGORIES' => VObject\Property\Text::class,
-        'SORT-STRING' => VObject\Property\FlatText::class,
-        'PRODID' => VObject\Property\FlatText::class,
-        'NICKNAME' => VObject\Property\Text::class,
-        'CLASS' => VObject\Property\FlatText::class, // Removed in vCard 4.0
-
-        // rfc2739 properties
-        'FBURL' => VObject\Property\Uri::class,
-        'CAPURI' => VObject\Property\Uri::class,
-        'CALURI' => VObject\Property\Uri::class,
-        'CALADRURI' => VObject\Property\Uri::class,
-
-        // rfc4770 properties
-        'IMPP' => VObject\Property\Uri::class,
-
-        // vCard 4.0 properties
-        'SOURCE' => VObject\Property\Uri::class,
-        'XML' => VObject\Property\FlatText::class,
-        'ANNIVERSARY' => VObject\Property\VCard\DateAndOrTime::class,
-        'CLIENTPIDMAP' => VObject\Property\Text::class,
-        'LANG' => VObject\Property\VCard\LanguageTag::class,
-        'GENDER' => VObject\Property\Text::class,
-        'KIND' => VObject\Property\FlatText::class,
-        'MEMBER' => VObject\Property\Uri::class,
-        'RELATED' => VObject\Property\Uri::class,
-
-        // rfc6474 properties
-        'BIRTHPLACE' => VObject\Property\FlatText::class,
-        'DEATHPLACE' => VObject\Property\FlatText::class,
-        'DEATHDATE' => VObject\Property\VCard\DateAndOrTime::class,
-
-        // rfc6715 properties
-        'EXPERTISE' => VObject\Property\FlatText::class,
-        'HOBBY' => VObject\Property\FlatText::class,
-        'INTEREST' => VObject\Property\FlatText::class,
-        'ORG-DIRECTORY' => VObject\Property\FlatText::class,
-    ];
-
-    /**
-     * 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 (1 === count($version)) {
-            $version = (string) $this->VERSION;
-            if ('2.1' !== $version && '3.0' !== $version && '4.0' !== $version) {
-                $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 ('2.1' === $version && ($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 (0 === count($uid)) {
-            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 (1 !== count($fn)) {
-            $repaired = false;
-            if (($options & self::REPAIR) && 0 === count($fn)) {
-                // 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;
-
-                // Otherwise, the NICKNAME property may work
-                } elseif (isset($this->NICKNAME)) {
-                    $this->FN = (string) $this->NICKNAME;
-                    $repaired = true;
-
-                // Otherwise, the EMAIL property may work
-                } elseif (isset($this->EMAIL)) {
-                    $this->FN = (string) $this->EMAIL;
-                    $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 whether 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
-     */
-    #[\ReturnTypeWillChange]
-    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
-     */
-    public function xmlSerialize(Xml\Writer $writer): void
-    {
-        $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) {
-                    case 'VERSION':
-                        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();
-            }
-        }
-
-        $writer->endElement();
-    }
-
-    /**
-     * Returns the default class for a property name.
-     *
-     * @param string $propertyName
-     *
-     * @return string
-     */
-    public function getClassNameForPropertyName($propertyName)
-    {
-        $className = parent::getClassNameForPropertyName($propertyName);
-
-        // In vCard 4, BINARY no longer exists, and we need URI instead.
-        if (VObject\Property\Binary::class == $className && self::VCARD40 === $this->getDocumentType()) {
-            return VObject\Property\Uri::class;
-        }
-
-        return $className;
-    }
+	/**
+	 * The default name for this component.
+	 *
+	 * This should be 'VCALENDAR' or 'VCARD'.
+	 *
+	 * @var string
+	 */
+	public 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
+	 */
+	public static $componentMap = [
+		'VCARD' => VCard::class,
+	];
+
+	/**
+	 * List of value-types, and which classes they map to.
+	 *
+	 * @var array
+	 */
+	public static $valueMap = [
+		'BINARY' => VObject\Property\Binary::class,
+		'BOOLEAN' => VObject\Property\Boolean::class,
+		'CONTENT-ID' => VObject\Property\FlatText::class,   // vCard 2.1 only
+		'DATE' => VObject\Property\VCard\Date::class,
+		'DATE-TIME' => VObject\Property\VCard\DateTime::class,
+		'DATE-AND-OR-TIME' => VObject\Property\VCard\DateAndOrTime::class, // vCard only
+		'FLOAT' => VObject\Property\FloatValue::class,
+		'INTEGER' => VObject\Property\IntegerValue::class,
+		'LANGUAGE-TAG' => VObject\Property\VCard\LanguageTag::class,
+		'PHONE-NUMBER' => VObject\Property\VCard\PhoneNumber::class, // vCard 3.0 only
+		'TIMESTAMP' => VObject\Property\VCard\TimeStamp::class,
+		'TEXT' => VObject\Property\Text::class,
+		'TIME' => VObject\Property\Time::class,
+		'UNKNOWN' => VObject\Property\Unknown::class, // jCard / jCal-only.
+		'URI' => VObject\Property\Uri::class,
+		'URL' => VObject\Property\Uri::class, // vCard 2.1 only
+		'UTC-OFFSET' => VObject\Property\UtcOffset::class,
+	];
+
+	/**
+	 * List of properties, and which classes they map to.
+	 *
+	 * @var array
+	 */
+	public static $propertyMap = [
+		// vCard 2.1 properties and up
+		'N' => VObject\Property\Text::class,
+		'FN' => VObject\Property\FlatText::class,
+		'PHOTO' => VObject\Property\Binary::class,
+		'BDAY' => VObject\Property\VCard\DateAndOrTime::class,
+		'ADR' => VObject\Property\Text::class,
+		'LABEL' => VObject\Property\FlatText::class, // Removed in vCard 4.0
+		'TEL' => VObject\Property\FlatText::class,
+		'EMAIL' => VObject\Property\FlatText::class,
+		'MAILER' => VObject\Property\FlatText::class, // Removed in vCard 4.0
+		'GEO' => VObject\Property\FlatText::class,
+		'TITLE' => VObject\Property\FlatText::class,
+		'ROLE' => VObject\Property\FlatText::class,
+		'LOGO' => VObject\Property\Binary::class,
+		// 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
+								 // not supported at the moment
+		'ORG' => VObject\Property\Text::class,
+		'NOTE' => VObject\Property\FlatText::class,
+		'REV' => VObject\Property\VCard\TimeStamp::class,
+		'SOUND' => VObject\Property\FlatText::class,
+		'URL' => VObject\Property\Uri::class,
+		'UID' => VObject\Property\FlatText::class,
+		'VERSION' => VObject\Property\FlatText::class,
+		'KEY' => VObject\Property\FlatText::class,
+		'TZ' => VObject\Property\Text::class,
+
+		// vCard 3.0 properties
+		'CATEGORIES' => VObject\Property\Text::class,
+		'SORT-STRING' => VObject\Property\FlatText::class,
+		'PRODID' => VObject\Property\FlatText::class,
+		'NICKNAME' => VObject\Property\Text::class,
+		'CLASS' => VObject\Property\FlatText::class, // Removed in vCard 4.0
+
+		// rfc2739 properties
+		'FBURL' => VObject\Property\Uri::class,
+		'CAPURI' => VObject\Property\Uri::class,
+		'CALURI' => VObject\Property\Uri::class,
+		'CALADRURI' => VObject\Property\Uri::class,
+
+		// rfc4770 properties
+		'IMPP' => VObject\Property\Uri::class,
+
+		// vCard 4.0 properties
+		'SOURCE' => VObject\Property\Uri::class,
+		'XML' => VObject\Property\FlatText::class,
+		'ANNIVERSARY' => VObject\Property\VCard\DateAndOrTime::class,
+		'CLIENTPIDMAP' => VObject\Property\Text::class,
+		'LANG' => VObject\Property\VCard\LanguageTag::class,
+		'GENDER' => VObject\Property\Text::class,
+		'KIND' => VObject\Property\FlatText::class,
+		'MEMBER' => VObject\Property\Uri::class,
+		'RELATED' => VObject\Property\Uri::class,
+
+		// rfc6474 properties
+		'BIRTHPLACE' => VObject\Property\FlatText::class,
+		'DEATHPLACE' => VObject\Property\FlatText::class,
+		'DEATHDATE' => VObject\Property\VCard\DateAndOrTime::class,
+
+		// rfc6715 properties
+		'EXPERTISE' => VObject\Property\FlatText::class,
+		'HOBBY' => VObject\Property\FlatText::class,
+		'INTEREST' => VObject\Property\FlatText::class,
+		'ORG-DIRECTORY' => VObject\Property\FlatText::class,
+	];
+
+	/**
+	 * 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 (1 === count($version)) {
+			$version = (string) $this->VERSION;
+			if ('2.1' !== $version && '3.0' !== $version && '4.0' !== $version) {
+				$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 ('2.1' === $version && ($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 (0 === count($uid)) {
+			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 (1 !== count($fn)) {
+			$repaired = false;
+			if (($options & self::REPAIR) && 0 === count($fn)) {
+				// 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;
+
+				// Otherwise, the NICKNAME property may work
+				} elseif (isset($this->NICKNAME)) {
+					$this->FN = (string) $this->NICKNAME;
+					$repaired = true;
+
+				// Otherwise, the EMAIL property may work
+				} elseif (isset($this->EMAIL)) {
+					$this->FN = (string) $this->EMAIL;
+					$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 whether 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
+	 */
+	#[\ReturnTypeWillChange]
+	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
+	 */
+	public function xmlSerialize(Xml\Writer $writer): void
+	{
+		$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) {
+					case 'VERSION':
+						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();
+			}
+		}
+
+		$writer->endElement();
+	}
+
+	/**
+	 * Returns the default class for a property name.
+	 *
+	 * @param string $propertyName
+	 *
+	 * @return string
+	 */
+	public function getClassNameForPropertyName($propertyName)
+	{
+		$className = parent::getClassNameForPropertyName($propertyName);
+
+		// In vCard 4, BINARY no longer exists, and we need URI instead.
+		if (VObject\Property\Binary::class == $className && self::VCARD40 === $this->getDocumentType()) {
+			return VObject\Property\Uri::class;
+		}
+
+		return $className;
+	}
 }