Dolibarr / dolibarr

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

Indentation +171 added lines, -171 removed lines

@@ -11,175 +11,175 @@
  */
 class FreeBusyData
 {
-    /**
-     * Start timestamp.
-     *
-     * @var int
-     */
-    protected $start;
-
-    /**
-     * End timestamp.
-     *
-     * @var int
-     */
-    protected $end;
-
-    /**
-     * A list of free-busy times.
-     *
-     * @var array
-     */
-    protected $data;
-
-    public function __construct($start, $end)
-    {
-        $this->start = $start;
-        $this->end = $end;
-        $this->data = [];
-
-        $this->data[] = [
-            'start' => $this->start,
-            'end' => $this->end,
-            'type' => 'FREE',
-        ];
-    }
-
-    /**
-     * Adds free or busytime to the data.
-     *
-     * @param int    $start
-     * @param int    $end
-     * @param string $type  FREE, BUSY, BUSY-UNAVAILABLE or BUSY-TENTATIVE
-     */
-    public function add($start, $end, $type)
-    {
-        if ($start > $this->end || $end < $this->start) {
-            // This new data is outside our timerange.
-            return;
-        }
-
-        if ($start < $this->start) {
-            // The item starts before our requested time range
-            $start = $this->start;
-        }
-        if ($end > $this->end) {
-            // The item ends after our requested time range
-            $end = $this->end;
-        }
-
-        // Finding out where we need to insert the new item.
-        $currentIndex = 0;
-        while ($start > $this->data[$currentIndex]['end']) {
-            ++$currentIndex;
-        }
-
-        // The standard insertion point will be one _after_ the first
-        // overlapping item.
-        $insertStartIndex = $currentIndex + 1;
-
-        $newItem = [
-            'start' => $start,
-            'end' => $end,
-            'type' => $type,
-        ];
-
-        $precedingItem = $this->data[$insertStartIndex - 1];
-        if ($this->data[$insertStartIndex - 1]['start'] === $start) {
-            // The old item starts at the exact same point as the new item.
-            --$insertStartIndex;
-        }
-
-        // Now we know where to insert the item, we need to know where it
-        // starts overlapping with items on the tail end. We need to start
-        // looking one item before the insertStartIndex, because it's possible
-        // that the new item 'sits inside' the previous old item.
-        if ($insertStartIndex > 0) {
-            $currentIndex = $insertStartIndex - 1;
-        } else {
-            $currentIndex = 0;
-        }
-
-        while ($end > $this->data[$currentIndex]['end']) {
-            ++$currentIndex;
-        }
-
-        // What we are about to insert into the array
-        $newItems = [
-            $newItem,
-        ];
-
-        // This is the amount of items that are completely overwritten by the
-        // new item.
-        $itemsToDelete = $currentIndex - $insertStartIndex;
-        if ($this->data[$currentIndex]['end'] <= $end) {
-            ++$itemsToDelete;
-        }
-
-        // If itemsToDelete was -1, it means that the newly inserted item is
-        // actually sitting inside an existing one. This means we need to split
-        // the item at the current position in two and insert the new item in
-        // between.
-        if (-1 === $itemsToDelete) {
-            $itemsToDelete = 0;
-            if ($newItem['end'] < $precedingItem['end']) {
-                $newItems[] = [
-                    'start' => $newItem['end'] + 1,
-                    'end' => $precedingItem['end'],
-                    'type' => $precedingItem['type'],
-                ];
-            }
-        }
-
-        array_splice(
-            $this->data,
-            $insertStartIndex,
-            $itemsToDelete,
-            $newItems
-        );
-
-        $doMerge = false;
-        $mergeOffset = $insertStartIndex;
-        $mergeItem = $newItem;
-        $mergeDelete = 1;
-
-        if (isset($this->data[$insertStartIndex - 1])) {
-            // Updating the start time of the previous item.
-            $this->data[$insertStartIndex - 1]['end'] = $start;
-
-            // If the previous and the current are of the same type, we can
-            // merge them into one item.
-            if ($this->data[$insertStartIndex - 1]['type'] === $this->data[$insertStartIndex]['type']) {
-                $doMerge = true;
-                --$mergeOffset;
-                ++$mergeDelete;
-                $mergeItem['start'] = $this->data[$insertStartIndex - 1]['start'];
-            }
-        }
-        if (isset($this->data[$insertStartIndex + 1])) {
-            // Updating the start time of the next item.
-            $this->data[$insertStartIndex + 1]['start'] = $end;
-
-            // If the next and the current are of the same type, we can
-            // merge them into one item.
-            if ($this->data[$insertStartIndex + 1]['type'] === $this->data[$insertStartIndex]['type']) {
-                $doMerge = true;
-                ++$mergeDelete;
-                $mergeItem['end'] = $this->data[$insertStartIndex + 1]['end'];
-            }
-        }
-        if ($doMerge) {
-            array_splice(
-                $this->data,
-                $mergeOffset,
-                $mergeDelete,
-                [$mergeItem]
-            );
-        }
-    }
-
-    public function getData()
-    {
-        return $this->data;
-    }
+	/**
+	 * Start timestamp.
+	 *
+	 * @var int
+	 */
+	protected $start;
+
+	/**
+	 * End timestamp.
+	 *
+	 * @var int
+	 */
+	protected $end;
+
+	/**
+	 * A list of free-busy times.
+	 *
+	 * @var array
+	 */
+	protected $data;
+
+	public function __construct($start, $end)
+	{
+		$this->start = $start;
+		$this->end = $end;
+		$this->data = [];
+
+		$this->data[] = [
+			'start' => $this->start,
+			'end' => $this->end,
+			'type' => 'FREE',
+		];
+	}
+
+	/**
+	 * Adds free or busytime to the data.
+	 *
+	 * @param int    $start
+	 * @param int    $end
+	 * @param string $type  FREE, BUSY, BUSY-UNAVAILABLE or BUSY-TENTATIVE
+	 */
+	public function add($start, $end, $type)
+	{
+		if ($start > $this->end || $end < $this->start) {
+			// This new data is outside our timerange.
+			return;
+		}
+
+		if ($start < $this->start) {
+			// The item starts before our requested time range
+			$start = $this->start;
+		}
+		if ($end > $this->end) {
+			// The item ends after our requested time range
+			$end = $this->end;
+		}
+
+		// Finding out where we need to insert the new item.
+		$currentIndex = 0;
+		while ($start > $this->data[$currentIndex]['end']) {
+			++$currentIndex;
+		}
+
+		// The standard insertion point will be one _after_ the first
+		// overlapping item.
+		$insertStartIndex = $currentIndex + 1;
+
+		$newItem = [
+			'start' => $start,
+			'end' => $end,
+			'type' => $type,
+		];
+
+		$precedingItem = $this->data[$insertStartIndex - 1];
+		if ($this->data[$insertStartIndex - 1]['start'] === $start) {
+			// The old item starts at the exact same point as the new item.
+			--$insertStartIndex;
+		}
+
+		// Now we know where to insert the item, we need to know where it
+		// starts overlapping with items on the tail end. We need to start
+		// looking one item before the insertStartIndex, because it's possible
+		// that the new item 'sits inside' the previous old item.
+		if ($insertStartIndex > 0) {
+			$currentIndex = $insertStartIndex - 1;
+		} else {
+			$currentIndex = 0;
+		}
+
+		while ($end > $this->data[$currentIndex]['end']) {
+			++$currentIndex;
+		}
+
+		// What we are about to insert into the array
+		$newItems = [
+			$newItem,
+		];
+
+		// This is the amount of items that are completely overwritten by the
+		// new item.
+		$itemsToDelete = $currentIndex - $insertStartIndex;
+		if ($this->data[$currentIndex]['end'] <= $end) {
+			++$itemsToDelete;
+		}
+
+		// If itemsToDelete was -1, it means that the newly inserted item is
+		// actually sitting inside an existing one. This means we need to split
+		// the item at the current position in two and insert the new item in
+		// between.
+		if (-1 === $itemsToDelete) {
+			$itemsToDelete = 0;
+			if ($newItem['end'] < $precedingItem['end']) {
+				$newItems[] = [
+					'start' => $newItem['end'] + 1,
+					'end' => $precedingItem['end'],
+					'type' => $precedingItem['type'],
+				];
+			}
+		}
+
+		array_splice(
+			$this->data,
+			$insertStartIndex,
+			$itemsToDelete,
+			$newItems
+		);
+
+		$doMerge = false;
+		$mergeOffset = $insertStartIndex;
+		$mergeItem = $newItem;
+		$mergeDelete = 1;
+
+		if (isset($this->data[$insertStartIndex - 1])) {
+			// Updating the start time of the previous item.
+			$this->data[$insertStartIndex - 1]['end'] = $start;
+
+			// If the previous and the current are of the same type, we can
+			// merge them into one item.
+			if ($this->data[$insertStartIndex - 1]['type'] === $this->data[$insertStartIndex]['type']) {
+				$doMerge = true;
+				--$mergeOffset;
+				++$mergeDelete;
+				$mergeItem['start'] = $this->data[$insertStartIndex - 1]['start'];
+			}
+		}
+		if (isset($this->data[$insertStartIndex + 1])) {
+			// Updating the start time of the next item.
+			$this->data[$insertStartIndex + 1]['start'] = $end;
+
+			// If the next and the current are of the same type, we can
+			// merge them into one item.
+			if ($this->data[$insertStartIndex + 1]['type'] === $this->data[$insertStartIndex]['type']) {
+				$doMerge = true;
+				++$mergeDelete;
+				$mergeItem['end'] = $this->data[$insertStartIndex + 1]['end'];
+			}
+		}
+		if ($doMerge) {
+			array_splice(
+				$this->data,
+				$mergeOffset,
+				$mergeDelete,
+				[$mergeItem]
+			);
+		}
+	}
+
+	public function getData()
+	{
+		return $this->data;
+	}
 }

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

Indentation +683 added lines, -683 removed lines

@@ -13,693 +13,693 @@
  */
 class Cli
 {
-    /**
-     * No output.
-     *
-     * @var bool
-     */
-    protected $quiet = false;
-
-    /**
-     * Help display.
-     *
-     * @var bool
-     */
-    protected $showHelp = false;
-
-    /**
-     * Whether to spit out 'mimedir' or 'json' format.
-     *
-     * @var string
-     */
-    protected $format;
-
-    /**
-     * JSON pretty print.
-     *
-     * @var bool
-     */
-    protected $pretty;
-
-    /**
-     * Source file.
-     *
-     * @var string
-     */
-    protected $inputPath;
-
-    /**
-     * Destination file.
-     *
-     * @var string
-     */
-    protected $outputPath;
-
-    /**
-     * output stream.
-     *
-     * @var resource
-     */
-    protected $stdout;
-
-    /**
-     * stdin.
-     *
-     * @var resource
-     */
-    protected $stdin;
-
-    /**
-     * stderr.
-     *
-     * @var resource
-     */
-    protected $stderr;
-
-    /**
-     * Input format (one of json or mimedir).
-     *
-     * @var string
-     */
-    protected $inputFormat;
-
-    /**
-     * Makes the parser less strict.
-     *
-     * @var bool
-     */
-    protected $forgiving = false;
-
-    /**
-     * Main function.
-     *
-     * @return int
-     */
-    public function main(array $argv)
-    {
-        // @codeCoverageIgnoreStart
-        // We cannot easily test this, so we'll skip it. Pretty basic anyway.
-
-        if (!$this->stderr) {
-            $this->stderr = fopen('php://stderr', 'w');
-        }
-        if (!$this->stdout) {
-            $this->stdout = fopen('php://stdout', 'w');
-        }
-        if (!$this->stdin) {
-            $this->stdin = fopen('php://stdin', 'r');
-        }
-
-        // @codeCoverageIgnoreEnd
-
-        try {
-            list($options, $positional) = $this->parseArguments($argv);
-
-            if (isset($options['q'])) {
-                $this->quiet = true;
-            }
-            $this->log($this->colorize('green', 'sabre/vobject ').$this->colorize('yellow', Version::VERSION));
-
-            foreach ($options as $name => $value) {
-                switch ($name) {
-                    case 'q':
-                        // Already handled earlier.
-                        break;
-                    case 'h':
-                    case 'help':
-                        $this->showHelp();
-
-                        return 0;
-                        break;
-                    case 'format':
-                        switch ($value) {
-                            // jcard/jcal documents
-                            case 'jcard':
-                            case 'jcal':
-                            // specific document versions
-                            case 'vcard21':
-                            case 'vcard30':
-                            case 'vcard40':
-                            case 'icalendar20':
-                            // specific formats
-                            case 'json':
-                            case 'mimedir':
-                            // icalendar/vcad
-                            case 'icalendar':
-                            case 'vcard':
-                                $this->format = $value;
-                                break;
-
-                            default:
-                                throw new InvalidArgumentException('Unknown format: '.$value);
-                        }
-                        break;
-                    case 'pretty':
-                        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-                            $this->pretty = true;
-                        }
-                        break;
-                    case 'forgiving':
-                        $this->forgiving = true;
-                        break;
-                    case 'inputformat':
-                        switch ($value) {
-                            // json formats
-                            case 'jcard':
-                            case 'jcal':
-                            case 'json':
-                                $this->inputFormat = 'json';
-                                break;
-
-                            // mimedir formats
-                            case 'mimedir':
-                            case 'icalendar':
-                            case 'vcard':
-                            case 'vcard21':
-                            case 'vcard30':
-                            case 'vcard40':
-                            case 'icalendar20':
-                                $this->inputFormat = 'mimedir';
-                                break;
-
-                            default:
-                                throw new InvalidArgumentException('Unknown format: '.$value);
-                        }
-                        break;
-                    default:
-                        throw new InvalidArgumentException('Unknown option: '.$name);
-                }
-            }
-
-            if (0 === count($positional)) {
-                $this->showHelp();
-
-                return 1;
-            }
-
-            if (1 === count($positional)) {
-                throw new InvalidArgumentException('Inputfile is a required argument');
-            }
-
-            if (count($positional) > 3) {
-                throw new InvalidArgumentException('Too many arguments');
-            }
-
-            if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
-                throw new InvalidArgumentException('Unknown command: '.$positional[0]);
-            }
-        } catch (InvalidArgumentException $e) {
-            $this->showHelp();
-            $this->log('Error: '.$e->getMessage(), 'red');
-
-            return 1;
-        }
-
-        $command = $positional[0];
-
-        $this->inputPath = $positional[1];
-        $this->outputPath = isset($positional[2]) ? $positional[2] : '-';
-
-        if ('-' !== $this->outputPath) {
-            $this->stdout = fopen($this->outputPath, 'w');
-        }
-
-        if (!$this->inputFormat) {
-            if ('.json' === substr($this->inputPath, -5)) {
-                $this->inputFormat = 'json';
-            } else {
-                $this->inputFormat = 'mimedir';
-            }
-        }
-        if (!$this->format) {
-            if ('.json' === substr($this->outputPath, -5)) {
-                $this->format = 'json';
-            } else {
-                $this->format = 'mimedir';
-            }
-        }
-
-        $realCode = 0;
-
-        try {
-            while ($input = $this->readInput()) {
-                $returnCode = $this->$command($input);
-                if (0 !== $returnCode) {
-                    $realCode = $returnCode;
-                }
-            }
-        } catch (EofException $e) {
-            // end of file
-        } catch (\Exception $e) {
-            $this->log('Error: '.$e->getMessage(), 'red');
-
-            return 2;
-        }
-
-        return $realCode;
-    }
-
-    /**
-     * Shows the help message.
-     */
-    protected function showHelp()
-    {
-        $this->log('Usage:', 'yellow');
-        $this->log('  vobject [options] command [arguments]');
-        $this->log('');
-        $this->log('Options:', 'yellow');
-        $this->log($this->colorize('green', '  -q            ')."Don't output anything.");
-        $this->log($this->colorize('green', '  -help -h      ').'Display this help message.');
-        $this->log($this->colorize('green', '  --format      ').'Convert to a specific format. Must be one of: vcard, vcard21,');
-        $this->log($this->colorize('green', '  --forgiving   ').'Makes the parser less strict.');
-        $this->log('                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.');
-        $this->log($this->colorize('green', '  --inputformat ').'If the input format cannot be guessed from the extension, it');
-        $this->log('                must be specified here.');
-        // Only PHP 5.4 and up
-        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-            $this->log($this->colorize('green', '  --pretty      ').'json pretty-print.');
-        }
-        $this->log('');
-        $this->log('Commands:', 'yellow');
-        $this->log($this->colorize('green', '  validate').' source_file              Validates a file for correctness.');
-        $this->log($this->colorize('green', '  repair').' source_file [output_file]  Repairs a file.');
-        $this->log($this->colorize('green', '  convert').' source_file [output_file] Converts a file.');
-        $this->log($this->colorize('green', '  color').' source_file                 Colorize a file, useful for debugging.');
-        $this->log(
-        <<<HELP
+	/**
+	 * No output.
+	 *
+	 * @var bool
+	 */
+	protected $quiet = false;
+
+	/**
+	 * Help display.
+	 *
+	 * @var bool
+	 */
+	protected $showHelp = false;
+
+	/**
+	 * Whether to spit out 'mimedir' or 'json' format.
+	 *
+	 * @var string
+	 */
+	protected $format;
+
+	/**
+	 * JSON pretty print.
+	 *
+	 * @var bool
+	 */
+	protected $pretty;
+
+	/**
+	 * Source file.
+	 *
+	 * @var string
+	 */
+	protected $inputPath;
+
+	/**
+	 * Destination file.
+	 *
+	 * @var string
+	 */
+	protected $outputPath;
+
+	/**
+	 * output stream.
+	 *
+	 * @var resource
+	 */
+	protected $stdout;
+
+	/**
+	 * stdin.
+	 *
+	 * @var resource
+	 */
+	protected $stdin;
+
+	/**
+	 * stderr.
+	 *
+	 * @var resource
+	 */
+	protected $stderr;
+
+	/**
+	 * Input format (one of json or mimedir).
+	 *
+	 * @var string
+	 */
+	protected $inputFormat;
+
+	/**
+	 * Makes the parser less strict.
+	 *
+	 * @var bool
+	 */
+	protected $forgiving = false;
+
+	/**
+	 * Main function.
+	 *
+	 * @return int
+	 */
+	public function main(array $argv)
+	{
+		// @codeCoverageIgnoreStart
+		// We cannot easily test this, so we'll skip it. Pretty basic anyway.
+
+		if (!$this->stderr) {
+			$this->stderr = fopen('php://stderr', 'w');
+		}
+		if (!$this->stdout) {
+			$this->stdout = fopen('php://stdout', 'w');
+		}
+		if (!$this->stdin) {
+			$this->stdin = fopen('php://stdin', 'r');
+		}
+
+		// @codeCoverageIgnoreEnd
+
+		try {
+			list($options, $positional) = $this->parseArguments($argv);
+
+			if (isset($options['q'])) {
+				$this->quiet = true;
+			}
+			$this->log($this->colorize('green', 'sabre/vobject ').$this->colorize('yellow', Version::VERSION));
+
+			foreach ($options as $name => $value) {
+				switch ($name) {
+					case 'q':
+						// Already handled earlier.
+						break;
+					case 'h':
+					case 'help':
+						$this->showHelp();
+
+						return 0;
+						break;
+					case 'format':
+						switch ($value) {
+							// jcard/jcal documents
+							case 'jcard':
+							case 'jcal':
+							// specific document versions
+							case 'vcard21':
+							case 'vcard30':
+							case 'vcard40':
+							case 'icalendar20':
+							// specific formats
+							case 'json':
+							case 'mimedir':
+							// icalendar/vcad
+							case 'icalendar':
+							case 'vcard':
+								$this->format = $value;
+								break;
+
+							default:
+								throw new InvalidArgumentException('Unknown format: '.$value);
+						}
+						break;
+					case 'pretty':
+						if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+							$this->pretty = true;
+						}
+						break;
+					case 'forgiving':
+						$this->forgiving = true;
+						break;
+					case 'inputformat':
+						switch ($value) {
+							// json formats
+							case 'jcard':
+							case 'jcal':
+							case 'json':
+								$this->inputFormat = 'json';
+								break;
+
+							// mimedir formats
+							case 'mimedir':
+							case 'icalendar':
+							case 'vcard':
+							case 'vcard21':
+							case 'vcard30':
+							case 'vcard40':
+							case 'icalendar20':
+								$this->inputFormat = 'mimedir';
+								break;
+
+							default:
+								throw new InvalidArgumentException('Unknown format: '.$value);
+						}
+						break;
+					default:
+						throw new InvalidArgumentException('Unknown option: '.$name);
+				}
+			}
+
+			if (0 === count($positional)) {
+				$this->showHelp();
+
+				return 1;
+			}
+
+			if (1 === count($positional)) {
+				throw new InvalidArgumentException('Inputfile is a required argument');
+			}
+
+			if (count($positional) > 3) {
+				throw new InvalidArgumentException('Too many arguments');
+			}
+
+			if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
+				throw new InvalidArgumentException('Unknown command: '.$positional[0]);
+			}
+		} catch (InvalidArgumentException $e) {
+			$this->showHelp();
+			$this->log('Error: '.$e->getMessage(), 'red');
+
+			return 1;
+		}
+
+		$command = $positional[0];
+
+		$this->inputPath = $positional[1];
+		$this->outputPath = isset($positional[2]) ? $positional[2] : '-';
+
+		if ('-' !== $this->outputPath) {
+			$this->stdout = fopen($this->outputPath, 'w');
+		}
+
+		if (!$this->inputFormat) {
+			if ('.json' === substr($this->inputPath, -5)) {
+				$this->inputFormat = 'json';
+			} else {
+				$this->inputFormat = 'mimedir';
+			}
+		}
+		if (!$this->format) {
+			if ('.json' === substr($this->outputPath, -5)) {
+				$this->format = 'json';
+			} else {
+				$this->format = 'mimedir';
+			}
+		}
+
+		$realCode = 0;
+
+		try {
+			while ($input = $this->readInput()) {
+				$returnCode = $this->$command($input);
+				if (0 !== $returnCode) {
+					$realCode = $returnCode;
+				}
+			}
+		} catch (EofException $e) {
+			// end of file
+		} catch (\Exception $e) {
+			$this->log('Error: '.$e->getMessage(), 'red');
+
+			return 2;
+		}
+
+		return $realCode;
+	}
+
+	/**
+	 * Shows the help message.
+	 */
+	protected function showHelp()
+	{
+		$this->log('Usage:', 'yellow');
+		$this->log('  vobject [options] command [arguments]');
+		$this->log('');
+		$this->log('Options:', 'yellow');
+		$this->log($this->colorize('green', '  -q            ')."Don't output anything.");
+		$this->log($this->colorize('green', '  -help -h      ').'Display this help message.');
+		$this->log($this->colorize('green', '  --format      ').'Convert to a specific format. Must be one of: vcard, vcard21,');
+		$this->log($this->colorize('green', '  --forgiving   ').'Makes the parser less strict.');
+		$this->log('                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.');
+		$this->log($this->colorize('green', '  --inputformat ').'If the input format cannot be guessed from the extension, it');
+		$this->log('                must be specified here.');
+		// Only PHP 5.4 and up
+		if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+			$this->log($this->colorize('green', '  --pretty      ').'json pretty-print.');
+		}
+		$this->log('');
+		$this->log('Commands:', 'yellow');
+		$this->log($this->colorize('green', '  validate').' source_file              Validates a file for correctness.');
+		$this->log($this->colorize('green', '  repair').' source_file [output_file]  Repairs a file.');
+		$this->log($this->colorize('green', '  convert').' source_file [output_file] Converts a file.');
+		$this->log($this->colorize('green', '  color').' source_file                 Colorize a file, useful for debugging.');
+		$this->log(
+		<<<HELP
 
 If source_file is set as '-', STDIN will be used.
 If output_file is omitted, STDOUT will be used.
 All other output is sent to STDERR.
 
 HELP
-        );
-
-        $this->log('Examples:', 'yellow');
-        $this->log('   vobject convert contact.vcf contact.json');
-        $this->log('   vobject convert --format=vcard40 old.vcf new.vcf');
-        $this->log('   vobject convert --inputformat=json --format=mimedir - -');
-        $this->log('   vobject color calendar.ics');
-        $this->log('');
-        $this->log('https://github.com/fruux/sabre-vobject', 'purple');
-    }
-
-    /**
-     * Validates a VObject file.
-     *
-     * @return int
-     */
-    protected function validate(Component $vObj)
-    {
-        $returnCode = 0;
-
-        switch ($vObj->name) {
-            case 'VCALENDAR':
-                $this->log('iCalendar: '.(string) $vObj->VERSION);
-                break;
-            case 'VCARD':
-                $this->log('vCard: '.(string) $vObj->VERSION);
-                break;
-        }
-
-        $warnings = $vObj->validate();
-        if (!count($warnings)) {
-            $this->log('  No warnings!');
-        } else {
-            $levels = [
-                1 => 'REPAIRED',
-                2 => 'WARNING',
-                3 => 'ERROR',
-            ];
-            $returnCode = 2;
-            foreach ($warnings as $warn) {
-                $extra = '';
-                if ($warn['node'] instanceof Property) {
-                    $extra = ' (property: "'.$warn['node']->name.'")';
-                }
-                $this->log('  ['.$levels[$warn['level']].'] '.$warn['message'].$extra);
-            }
-        }
-
-        return $returnCode;
-    }
-
-    /**
-     * Repairs a VObject file.
-     *
-     * @return int
-     */
-    protected function repair(Component $vObj)
-    {
-        $returnCode = 0;
-
-        switch ($vObj->name) {
-            case 'VCALENDAR':
-                $this->log('iCalendar: '.(string) $vObj->VERSION);
-                break;
-            case 'VCARD':
-                $this->log('vCard: '.(string) $vObj->VERSION);
-                break;
-        }
-
-        $warnings = $vObj->validate(Node::REPAIR);
-        if (!count($warnings)) {
-            $this->log('  No warnings!');
-        } else {
-            $levels = [
-                1 => 'REPAIRED',
-                2 => 'WARNING',
-                3 => 'ERROR',
-            ];
-            $returnCode = 2;
-            foreach ($warnings as $warn) {
-                $extra = '';
-                if ($warn['node'] instanceof Property) {
-                    $extra = ' (property: "'.$warn['node']->name.'")';
-                }
-                $this->log('  ['.$levels[$warn['level']].'] '.$warn['message'].$extra);
-            }
-        }
-        fwrite($this->stdout, $vObj->serialize());
-
-        return $returnCode;
-    }
-
-    /**
-     * Converts a vObject file to a new format.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function convert($vObj)
-    {
-        $json = false;
-        $convertVersion = null;
-        $forceInput = null;
-
-        switch ($this->format) {
-            case 'json':
-                $json = true;
-                if ('VCARD' === $vObj->name) {
-                    $convertVersion = Document::VCARD40;
-                }
-                break;
-            case 'jcard':
-                $json = true;
-                $forceInput = 'VCARD';
-                $convertVersion = Document::VCARD40;
-                break;
-            case 'jcal':
-                $json = true;
-                $forceInput = 'VCALENDAR';
-                break;
-            case 'mimedir':
-            case 'icalendar':
-            case 'icalendar20':
-            case 'vcard':
-                break;
-            case 'vcard21':
-                $convertVersion = Document::VCARD21;
-                break;
-            case 'vcard30':
-                $convertVersion = Document::VCARD30;
-                break;
-            case 'vcard40':
-                $convertVersion = Document::VCARD40;
-                break;
-        }
-
-        if ($forceInput && $vObj->name !== $forceInput) {
-            throw new \Exception('You cannot convert a '.strtolower($vObj->name).' to '.$this->format);
-        }
-        if ($convertVersion) {
-            $vObj = $vObj->convert($convertVersion);
-        }
-        if ($json) {
-            $jsonOptions = 0;
-            if ($this->pretty) {
-                $jsonOptions = JSON_PRETTY_PRINT;
-            }
-            fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
-        } else {
-            fwrite($this->stdout, $vObj->serialize());
-        }
-
-        return 0;
-    }
-
-    /**
-     * Colorizes a file.
-     *
-     * @param Component $vObj
-     */
-    protected function color($vObj)
-    {
-        $this->serializeComponent($vObj);
-    }
-
-    /**
-     * Returns an ansi color string for a color name.
-     *
-     * @param string $color
-     *
-     * @return string
-     */
-    protected function colorize($color, $str, $resetTo = 'default')
-    {
-        $colors = [
-            'cyan' => '1;36',
-            'red' => '1;31',
-            'yellow' => '1;33',
-            'blue' => '0;34',
-            'green' => '0;32',
-            'default' => '0',
-            'purple' => '0;35',
-        ];
-
-        return "\033[".$colors[$color].'m'.$str."\033[".$colors[$resetTo].'m';
-    }
-
-    /**
-     * Writes out a string in specific color.
-     *
-     * @param string $color
-     * @param string $str
-     */
-    protected function cWrite($color, $str)
-    {
-        fwrite($this->stdout, $this->colorize($color, $str));
-    }
-
-    protected function serializeComponent(Component $vObj)
-    {
-        $this->cWrite('cyan', 'BEGIN');
-        $this->cWrite('red', ':');
-        $this->cWrite('yellow', $vObj->name."\n");
-
-        /**
-         * Gives a component a 'score' for sorting purposes.
-         *
-         * This is solely used by the childrenSort method.
-         *
-         * A higher score means the item will be lower in the list.
-         * To avoid score collisions, each "score category" has a reasonable
-         * space to accommodate elements. The $key is added to the $score to
-         * preserve the original relative order of elements.
-         *
-         * @param int   $key
-         * @param array $array
-         *
-         * @return int
-         */
-        $sortScore = function ($key, $array) {
-            if ($array[$key] instanceof Component) {
-                // We want to encode VTIMEZONE first, this is a personal
-                // preference.
-                if ('VTIMEZONE' === $array[$key]->name) {
-                    $score = 300000000;
-
-                    return $score + $key;
-                } else {
-                    $score = 400000000;
-
-                    return $score + $key;
-                }
-            } else {
-                // Properties get encoded first
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($array[$key] instanceof Property) {
-                    if ('VERSION' === $array[$key]->name) {
-                        $score = 100000000;
-
-                        return $score + $key;
-                    } else {
-                        // All other properties
-                        $score = 200000000;
-
-                        return $score + $key;
-                    }
-                }
-            }
-        };
-
-        $children = $vObj->children();
-        $tmp = $children;
-        uksort(
-            $children,
-            function ($a, $b) use ($sortScore, $tmp) {
-                $sA = $sortScore($a, $tmp);
-                $sB = $sortScore($b, $tmp);
-
-                return $sA - $sB;
-            }
-        );
-
-        foreach ($children as $child) {
-            if ($child instanceof Component) {
-                $this->serializeComponent($child);
-            } else {
-                $this->serializeProperty($child);
-            }
-        }
-
-        $this->cWrite('cyan', 'END');
-        $this->cWrite('red', ':');
-        $this->cWrite('yellow', $vObj->name."\n");
-    }
-
-    /**
-     * Colorizes a property.
-     */
-    protected function serializeProperty(Property $property)
-    {
-        if ($property->group) {
-            $this->cWrite('default', $property->group);
-            $this->cWrite('red', '.');
-        }
-
-        $this->cWrite('yellow', $property->name);
-
-        foreach ($property->parameters as $param) {
-            $this->cWrite('red', ';');
-            $this->cWrite('blue', $param->serialize());
-        }
-        $this->cWrite('red', ':');
-
-        if ($property instanceof Property\Binary) {
-            $this->cWrite('default', 'embedded binary stripped. ('.strlen($property->getValue()).' bytes)');
-        } else {
-            $parts = $property->getParts();
-            $first1 = true;
-            // Looping through property values
-            foreach ($parts as $part) {
-                if ($first1) {
-                    $first1 = false;
-                } else {
-                    $this->cWrite('red', $property->delimiter);
-                }
-                $first2 = true;
-                // Looping through property sub-values
-                foreach ((array) $part as $subPart) {
-                    if ($first2) {
-                        $first2 = false;
-                    } else {
-                        // The sub-value delimiter is always comma
-                        $this->cWrite('red', ',');
-                    }
-
-                    $subPart = strtr(
-                        $subPart,
-                        [
-                            '\\' => $this->colorize('purple', '\\\\', 'green'),
-                            ';' => $this->colorize('purple', '\;', 'green'),
-                            ',' => $this->colorize('purple', '\,', 'green'),
-                            "\n" => $this->colorize('purple', "\\n\n\t", 'green'),
-                            "\r" => '',
-                        ]
-                    );
-
-                    $this->cWrite('green', $subPart);
-                }
-            }
-        }
-        $this->cWrite('default', "\n");
-    }
-
-    /**
-     * Parses the list of arguments.
-     */
-    protected function parseArguments(array $argv)
-    {
-        $positional = [];
-        $options = [];
-
-        for ($ii = 0; $ii < count($argv); ++$ii) {
-            // Skipping the first argument.
-            if (0 === $ii) {
-                continue;
-            }
-
-            $v = $argv[$ii];
-
-            if ('--' === substr($v, 0, 2)) {
-                // This is a long-form option.
-                $optionName = substr($v, 2);
-                $optionValue = true;
-                if (strpos($optionName, '=')) {
-                    list($optionName, $optionValue) = explode('=', $optionName);
-                }
-                $options[$optionName] = $optionValue;
-            } elseif ('-' === substr($v, 0, 1) && strlen($v) > 1) {
-                // This is a short-form option.
-                foreach (str_split(substr($v, 1)) as $option) {
-                    $options[$option] = true;
-                }
-            } else {
-                $positional[] = $v;
-            }
-        }
-
-        return [$options, $positional];
-    }
-
-    protected $parser;
-
-    /**
-     * Reads the input file.
-     *
-     * @return Component
-     */
-    protected function readInput()
-    {
-        if (!$this->parser) {
-            if ('-' !== $this->inputPath) {
-                $this->stdin = fopen($this->inputPath, 'r');
-            }
-
-            if ('mimedir' === $this->inputFormat) {
-                $this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
-            } else {
-                $this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
-            }
-        }
-
-        return $this->parser->parse();
-    }
-
-    /**
-     * Sends a message to STDERR.
-     *
-     * @param string $msg
-     */
-    protected function log($msg, $color = 'default')
-    {
-        if (!$this->quiet) {
-            if ('default' !== $color) {
-                $msg = $this->colorize($color, $msg);
-            }
-            fwrite($this->stderr, $msg."\n");
-        }
-    }
+		);
+
+		$this->log('Examples:', 'yellow');
+		$this->log('   vobject convert contact.vcf contact.json');
+		$this->log('   vobject convert --format=vcard40 old.vcf new.vcf');
+		$this->log('   vobject convert --inputformat=json --format=mimedir - -');
+		$this->log('   vobject color calendar.ics');
+		$this->log('');
+		$this->log('https://github.com/fruux/sabre-vobject', 'purple');
+	}
+
+	/**
+	 * Validates a VObject file.
+	 *
+	 * @return int
+	 */
+	protected function validate(Component $vObj)
+	{
+		$returnCode = 0;
+
+		switch ($vObj->name) {
+			case 'VCALENDAR':
+				$this->log('iCalendar: '.(string) $vObj->VERSION);
+				break;
+			case 'VCARD':
+				$this->log('vCard: '.(string) $vObj->VERSION);
+				break;
+		}
+
+		$warnings = $vObj->validate();
+		if (!count($warnings)) {
+			$this->log('  No warnings!');
+		} else {
+			$levels = [
+				1 => 'REPAIRED',
+				2 => 'WARNING',
+				3 => 'ERROR',
+			];
+			$returnCode = 2;
+			foreach ($warnings as $warn) {
+				$extra = '';
+				if ($warn['node'] instanceof Property) {
+					$extra = ' (property: "'.$warn['node']->name.'")';
+				}
+				$this->log('  ['.$levels[$warn['level']].'] '.$warn['message'].$extra);
+			}
+		}
+
+		return $returnCode;
+	}
+
+	/**
+	 * Repairs a VObject file.
+	 *
+	 * @return int
+	 */
+	protected function repair(Component $vObj)
+	{
+		$returnCode = 0;
+
+		switch ($vObj->name) {
+			case 'VCALENDAR':
+				$this->log('iCalendar: '.(string) $vObj->VERSION);
+				break;
+			case 'VCARD':
+				$this->log('vCard: '.(string) $vObj->VERSION);
+				break;
+		}
+
+		$warnings = $vObj->validate(Node::REPAIR);
+		if (!count($warnings)) {
+			$this->log('  No warnings!');
+		} else {
+			$levels = [
+				1 => 'REPAIRED',
+				2 => 'WARNING',
+				3 => 'ERROR',
+			];
+			$returnCode = 2;
+			foreach ($warnings as $warn) {
+				$extra = '';
+				if ($warn['node'] instanceof Property) {
+					$extra = ' (property: "'.$warn['node']->name.'")';
+				}
+				$this->log('  ['.$levels[$warn['level']].'] '.$warn['message'].$extra);
+			}
+		}
+		fwrite($this->stdout, $vObj->serialize());
+
+		return $returnCode;
+	}
+
+	/**
+	 * Converts a vObject file to a new format.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function convert($vObj)
+	{
+		$json = false;
+		$convertVersion = null;
+		$forceInput = null;
+
+		switch ($this->format) {
+			case 'json':
+				$json = true;
+				if ('VCARD' === $vObj->name) {
+					$convertVersion = Document::VCARD40;
+				}
+				break;
+			case 'jcard':
+				$json = true;
+				$forceInput = 'VCARD';
+				$convertVersion = Document::VCARD40;
+				break;
+			case 'jcal':
+				$json = true;
+				$forceInput = 'VCALENDAR';
+				break;
+			case 'mimedir':
+			case 'icalendar':
+			case 'icalendar20':
+			case 'vcard':
+				break;
+			case 'vcard21':
+				$convertVersion = Document::VCARD21;
+				break;
+			case 'vcard30':
+				$convertVersion = Document::VCARD30;
+				break;
+			case 'vcard40':
+				$convertVersion = Document::VCARD40;
+				break;
+		}
+
+		if ($forceInput && $vObj->name !== $forceInput) {
+			throw new \Exception('You cannot convert a '.strtolower($vObj->name).' to '.$this->format);
+		}
+		if ($convertVersion) {
+			$vObj = $vObj->convert($convertVersion);
+		}
+		if ($json) {
+			$jsonOptions = 0;
+			if ($this->pretty) {
+				$jsonOptions = JSON_PRETTY_PRINT;
+			}
+			fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
+		} else {
+			fwrite($this->stdout, $vObj->serialize());
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Colorizes a file.
+	 *
+	 * @param Component $vObj
+	 */
+	protected function color($vObj)
+	{
+		$this->serializeComponent($vObj);
+	}
+
+	/**
+	 * Returns an ansi color string for a color name.
+	 *
+	 * @param string $color
+	 *
+	 * @return string
+	 */
+	protected function colorize($color, $str, $resetTo = 'default')
+	{
+		$colors = [
+			'cyan' => '1;36',
+			'red' => '1;31',
+			'yellow' => '1;33',
+			'blue' => '0;34',
+			'green' => '0;32',
+			'default' => '0',
+			'purple' => '0;35',
+		];
+
+		return "\033[".$colors[$color].'m'.$str."\033[".$colors[$resetTo].'m';
+	}
+
+	/**
+	 * Writes out a string in specific color.
+	 *
+	 * @param string $color
+	 * @param string $str
+	 */
+	protected function cWrite($color, $str)
+	{
+		fwrite($this->stdout, $this->colorize($color, $str));
+	}
+
+	protected function serializeComponent(Component $vObj)
+	{
+		$this->cWrite('cyan', 'BEGIN');
+		$this->cWrite('red', ':');
+		$this->cWrite('yellow', $vObj->name."\n");
+
+		/**
+		 * Gives a component a 'score' for sorting purposes.
+		 *
+		 * This is solely used by the childrenSort method.
+		 *
+		 * A higher score means the item will be lower in the list.
+		 * To avoid score collisions, each "score category" has a reasonable
+		 * space to accommodate elements. The $key is added to the $score to
+		 * preserve the original relative order of elements.
+		 *
+		 * @param int   $key
+		 * @param array $array
+		 *
+		 * @return int
+		 */
+		$sortScore = function ($key, $array) {
+			if ($array[$key] instanceof Component) {
+				// We want to encode VTIMEZONE first, this is a personal
+				// preference.
+				if ('VTIMEZONE' === $array[$key]->name) {
+					$score = 300000000;
+
+					return $score + $key;
+				} else {
+					$score = 400000000;
+
+					return $score + $key;
+				}
+			} else {
+				// Properties get encoded first
+				// VCARD version 4.0 wants the VERSION property to appear first
+				if ($array[$key] instanceof Property) {
+					if ('VERSION' === $array[$key]->name) {
+						$score = 100000000;
+
+						return $score + $key;
+					} else {
+						// All other properties
+						$score = 200000000;
+
+						return $score + $key;
+					}
+				}
+			}
+		};
+
+		$children = $vObj->children();
+		$tmp = $children;
+		uksort(
+			$children,
+			function ($a, $b) use ($sortScore, $tmp) {
+				$sA = $sortScore($a, $tmp);
+				$sB = $sortScore($b, $tmp);
+
+				return $sA - $sB;
+			}
+		);
+
+		foreach ($children as $child) {
+			if ($child instanceof Component) {
+				$this->serializeComponent($child);
+			} else {
+				$this->serializeProperty($child);
+			}
+		}
+
+		$this->cWrite('cyan', 'END');
+		$this->cWrite('red', ':');
+		$this->cWrite('yellow', $vObj->name."\n");
+	}
+
+	/**
+	 * Colorizes a property.
+	 */
+	protected function serializeProperty(Property $property)
+	{
+		if ($property->group) {
+			$this->cWrite('default', $property->group);
+			$this->cWrite('red', '.');
+		}
+
+		$this->cWrite('yellow', $property->name);
+
+		foreach ($property->parameters as $param) {
+			$this->cWrite('red', ';');
+			$this->cWrite('blue', $param->serialize());
+		}
+		$this->cWrite('red', ':');
+
+		if ($property instanceof Property\Binary) {
+			$this->cWrite('default', 'embedded binary stripped. ('.strlen($property->getValue()).' bytes)');
+		} else {
+			$parts = $property->getParts();
+			$first1 = true;
+			// Looping through property values
+			foreach ($parts as $part) {
+				if ($first1) {
+					$first1 = false;
+				} else {
+					$this->cWrite('red', $property->delimiter);
+				}
+				$first2 = true;
+				// Looping through property sub-values
+				foreach ((array) $part as $subPart) {
+					if ($first2) {
+						$first2 = false;
+					} else {
+						// The sub-value delimiter is always comma
+						$this->cWrite('red', ',');
+					}
+
+					$subPart = strtr(
+						$subPart,
+						[
+							'\\' => $this->colorize('purple', '\\\\', 'green'),
+							';' => $this->colorize('purple', '\;', 'green'),
+							',' => $this->colorize('purple', '\,', 'green'),
+							"\n" => $this->colorize('purple', "\\n\n\t", 'green'),
+							"\r" => '',
+						]
+					);
+
+					$this->cWrite('green', $subPart);
+				}
+			}
+		}
+		$this->cWrite('default', "\n");
+	}
+
+	/**
+	 * Parses the list of arguments.
+	 */
+	protected function parseArguments(array $argv)
+	{
+		$positional = [];
+		$options = [];
+
+		for ($ii = 0; $ii < count($argv); ++$ii) {
+			// Skipping the first argument.
+			if (0 === $ii) {
+				continue;
+			}
+
+			$v = $argv[$ii];
+
+			if ('--' === substr($v, 0, 2)) {
+				// This is a long-form option.
+				$optionName = substr($v, 2);
+				$optionValue = true;
+				if (strpos($optionName, '=')) {
+					list($optionName, $optionValue) = explode('=', $optionName);
+				}
+				$options[$optionName] = $optionValue;
+			} elseif ('-' === substr($v, 0, 1) && strlen($v) > 1) {
+				// This is a short-form option.
+				foreach (str_split(substr($v, 1)) as $option) {
+					$options[$option] = true;
+				}
+			} else {
+				$positional[] = $v;
+			}
+		}
+
+		return [$options, $positional];
+	}
+
+	protected $parser;
+
+	/**
+	 * Reads the input file.
+	 *
+	 * @return Component
+	 */
+	protected function readInput()
+	{
+		if (!$this->parser) {
+			if ('-' !== $this->inputPath) {
+				$this->stdin = fopen($this->inputPath, 'r');
+			}
+
+			if ('mimedir' === $this->inputFormat) {
+				$this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+			} else {
+				$this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+			}
+		}
+
+		return $this->parser->parse();
+	}
+
+	/**
+	 * Sends a message to STDERR.
+	 *
+	 * @param string $msg
+	 */
+	protected function log($msg, $color = 'default')
+	{
+		if (!$this->quiet) {
+			if ('default' !== $color) {
+				$msg = $this->colorize($color, $msg);
+			}
+			fwrite($this->stderr, $msg."\n");
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -513,7 +513,7 @@ 
          *
          * @return int
          */
-        $sortScore = function ($key, $array) {
+        $sortScore = function($key, $array) {
             if ($array[$key] instanceof Component) {
                 // We want to encode VTIMEZONE first, this is a personal
                 // preference.
@@ -548,7 +548,7 @@ 
         $tmp = $children;
         uksort(
             $children,
-            function ($a, $b) use ($sortScore, $tmp) {
+            function($a, $b) use ($sortScore, $tmp) {
                 $sA = $sortScore($a, $tmp);
                 $sB = $sortScore($b, $tmp);
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
 If output_file is omitted, STDOUT will be used.
 All other output is sent to STDERR.
 
-HELP
+help
         );
 
         $this->log('Examples:', 'yellow');

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

Spacing +3 added lines, -3 removed lines

@@ -237,7 +237,7 @@ 
                 // more.
                 return array_filter(
                     $result,
-                    function ($child) use ($group) {
+                    function($child) use ($group) {
                         return $child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group;
                     }
                 );
@@ -282,7 +282,7 @@ 
          *
          * @return int
          */
-        $sortScore = function ($key, $array) {
+        $sortScore = function($key, $array) {
             if ($array[$key] instanceof Component) {
                 // We want to encode VTIMEZONE first, this is a personal
                 // preference.
@@ -317,7 +317,7 @@ 
         $tmp = $children;
         uksort(
             $children,
-            function ($a, $b) use ($sortScore, $tmp) {
+            function($a, $b) use ($sortScore, $tmp) {
                 $sA = $sortScore($a, $tmp);
                 $sB = $sortScore($b, $tmp);
 

Indentation +653 added lines, -653 removed lines

@@ -16,657 +16,657 @@
  */
 class Component extends Node
 {
-    /**
-     * Component name.
-     *
-     * This will contain a string such as VEVENT, VTODO, VCALENDAR, VCARD.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * A list of properties and/or sub-components.
-     *
-     * @var array<string, Component|Property>
-     */
-    protected $children = [];
-
-    /**
-     * Creates a new component.
-     *
-     * You can specify the children either in key=>value syntax, in which case
-     * properties will automatically be created, or you can just pass a list of
-     * Component and Property object.
-     *
-     * By default, a set of sensible values will be added to the component. For
-     * an iCalendar object, this may be something like CALSCALE:GREGORIAN. To
-     * ensure that this does not happen, set $defaults to false.
-     *
-     * @param string|null $name     such as VCALENDAR, VEVENT
-     * @param bool        $defaults
-     */
-    public function __construct(Document $root, $name, array $children = [], $defaults = true)
-    {
-        $this->name = isset($name) ? strtoupper($name) : '';
-        $this->root = $root;
-
-        if ($defaults) {
-            // This is a terribly convoluted way to do this, but this ensures
-            // that the order of properties as they are specified in both
-            // defaults and the childrens list, are inserted in the object in a
-            // natural way.
-            $list = $this->getDefaults();
-            $nodes = [];
-            foreach ($children as $key => $value) {
-                if ($value instanceof Node) {
-                    if (isset($list[$value->name])) {
-                        unset($list[$value->name]);
-                    }
-                    $nodes[] = $value;
-                } else {
-                    $list[$key] = $value;
-                }
-            }
-            foreach ($list as $key => $value) {
-                $this->add($key, $value);
-            }
-            foreach ($nodes as $node) {
-                $this->add($node);
-            }
-        } else {
-            foreach ($children as $k => $child) {
-                if ($child instanceof Node) {
-                    // Component or Property
-                    $this->add($child);
-                } else {
-                    // Property key=>value
-                    $this->add($k, $child);
-                }
-            }
-        }
-    }
-
-    /**
-     * Adds a new property or component, and returns the new item.
-     *
-     * This method has 3 possible signatures:
-     *
-     * add(Component $comp) // Adds a new component
-     * add(Property $prop)  // Adds a new property
-     * add($name, $value, array $parameters = []) // Adds a new property
-     * add($name, array $children = []) // Adds a new component
-     * by name.
-     *
-     * @return Node
-     */
-    public function add()
-    {
-        $arguments = func_get_args();
-
-        if ($arguments[0] instanceof Node) {
-            if (isset($arguments[1])) {
-                throw new \InvalidArgumentException('The second argument must not be specified, when passing a VObject Node');
-            }
-            $arguments[0]->parent = $this;
-            $newNode = $arguments[0];
-        } elseif (is_string($arguments[0])) {
-            $newNode = call_user_func_array([$this->root, 'create'], $arguments);
-        } else {
-            throw new \InvalidArgumentException('The first argument must either be a \\Sabre\\VObject\\Node or a string');
-        }
-
-        $name = $newNode->name;
-        if (isset($this->children[$name])) {
-            $this->children[$name][] = $newNode;
-        } else {
-            $this->children[$name] = [$newNode];
-        }
-
-        return $newNode;
-    }
-
-    /**
-     * This method removes a component or property from this component.
-     *
-     * You can either specify the item by name (like DTSTART), in which case
-     * all properties/components with that name will be removed, or you can
-     * pass an instance of a property or component, in which case only that
-     * exact item will be removed.
-     *
-     * @param string|Property|Component $item
-     */
-    public function remove($item)
-    {
-        if (is_string($item)) {
-            // If there's no dot in the name, it's an exact property name and
-            // we can just wipe out all those properties.
-            //
-            if (false === strpos($item, '.')) {
-                unset($this->children[strtoupper($item)]);
-
-                return;
-            }
-            // If there was a dot, we need to ask select() to help us out and
-            // then we just call remove recursively.
-            foreach ($this->select($item) as $child) {
-                $this->remove($child);
-            }
-        } else {
-            foreach ($this->select($item->name) as $k => $child) {
-                if ($child === $item) {
-                    unset($this->children[$item->name][$k]);
-
-                    return;
-                }
-            }
-
-            throw new \InvalidArgumentException('The item you passed to remove() was not a child of this component');
-        }
-    }
-
-    /**
-     * Returns a flat list of all the properties and components in this
-     * component.
-     *
-     * @return array
-     */
-    public function children()
-    {
-        $result = [];
-        foreach ($this->children as $childGroup) {
-            $result = array_merge($result, $childGroup);
-        }
-
-        return $result;
-    }
-
-    /**
-     * This method only returns a list of sub-components. Properties are
-     * ignored.
-     *
-     * @return array
-     */
-    public function getComponents()
-    {
-        $result = [];
-
-        foreach ($this->children as $childGroup) {
-            foreach ($childGroup as $child) {
-                if ($child instanceof self) {
-                    $result[] = $child;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns an array with elements that match the specified name.
-     *
-     * This function is also aware of MIME-Directory groups (as they appear in
-     * vcards). This means that if a property is grouped as "HOME.EMAIL", it
-     * will also be returned when searching for just "EMAIL". If you want to
-     * search for a property in a specific group, you can select on the entire
-     * string ("HOME.EMAIL"). If you want to search on a specific property that
-     * has not been assigned a group, specify ".EMAIL".
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function select($name)
-    {
-        $group = null;
-        $name = strtoupper($name);
-        if (false !== strpos($name, '.')) {
-            list($group, $name) = explode('.', $name, 2);
-        }
-        if ('' === $name) {
-            $name = null;
-        }
-
-        if (!is_null($name)) {
-            $result = isset($this->children[$name]) ? $this->children[$name] : [];
-
-            if (is_null($group)) {
-                return $result;
-            } else {
-                // If we have a group filter as well, we need to narrow it down
-                // more.
-                return array_filter(
-                    $result,
-                    function ($child) use ($group) {
-                        return $child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group;
-                    }
-                );
-            }
-        }
-
-        // If we got to this point, it means there was no 'name' specified for
-        // searching, implying that this is a group-only search.
-        $result = [];
-        foreach ($this->children as $childGroup) {
-            foreach ($childGroup as $child) {
-                if ($child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group) {
-                    $result[] = $child;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        $str = 'BEGIN:'.$this->name."\r\n";
-
-        /**
-         * Gives a component a 'score' for sorting purposes.
-         *
-         * This is solely used by the childrenSort method.
-         *
-         * A higher score means the item will be lower in the list.
-         * To avoid score collisions, each "score category" has a reasonable
-         * space to accommodate elements. The $key is added to the $score to
-         * preserve the original relative order of elements.
-         *
-         * @param int   $key
-         * @param array $array
-         *
-         * @return int
-         */
-        $sortScore = function ($key, $array) {
-            if ($array[$key] instanceof Component) {
-                // We want to encode VTIMEZONE first, this is a personal
-                // preference.
-                if ('VTIMEZONE' === $array[$key]->name) {
-                    $score = 300000000;
-
-                    return $score + $key;
-                } else {
-                    $score = 400000000;
-
-                    return $score + $key;
-                }
-            } else {
-                // Properties get encoded first
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($array[$key] instanceof Property) {
-                    if ('VERSION' === $array[$key]->name) {
-                        $score = 100000000;
-
-                        return $score + $key;
-                    } else {
-                        // All other properties
-                        $score = 200000000;
-
-                        return $score + $key;
-                    }
-                }
-            }
-        };
-
-        $children = $this->children();
-        $tmp = $children;
-        uksort(
-            $children,
-            function ($a, $b) use ($sortScore, $tmp) {
-                $sA = $sortScore($a, $tmp);
-                $sB = $sortScore($b, $tmp);
-
-                return $sA - $sB;
-            }
-        );
-
-        foreach ($children as $child) {
-            $str .= $child->serialize();
-        }
-        $str .= 'END:'.$this->name."\r\n";
-
-        return $str;
-    }
-
-    /**
-     * 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()
-    {
-        $components = [];
-        $properties = [];
-
-        foreach ($this->children as $childGroup) {
-            foreach ($childGroup as $child) {
-                if ($child instanceof self) {
-                    $components[] = $child->jsonSerialize();
-                } else {
-                    $properties[] = $child->jsonSerialize();
-                }
-            }
-        }
-
-        return [
-            strtolower($this->name),
-            $properties,
-            $components,
-        ];
-    }
-
-    /**
-     * 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
-    {
-        $components = [];
-        $properties = [];
-
-        foreach ($this->children as $childGroup) {
-            foreach ($childGroup as $child) {
-                if ($child instanceof self) {
-                    $components[] = $child;
-                } else {
-                    $properties[] = $child;
-                }
-            }
-        }
-
-        $writer->startElement(strtolower($this->name));
-
-        if (!empty($properties)) {
-            $writer->startElement('properties');
-
-            foreach ($properties as $property) {
-                $property->xmlSerialize($writer);
-            }
-
-            $writer->endElement();
-        }
-
-        if (!empty($components)) {
-            $writer->startElement('components');
-
-            foreach ($components as $component) {
-                $component->xmlSerialize($writer);
-            }
-
-            $writer->endElement();
-        }
-
-        $writer->endElement();
-    }
-
-    /**
-     * This method should return a list of default property values.
-     *
-     * @return array
-     */
-    protected function getDefaults()
-    {
-        return [];
-    }
-
-    /* Magic property accessors {{{ */
-
-    /**
-     * Using 'get' you will either get a property or component.
-     *
-     * If there were no child-elements found with the specified name,
-     * null is returned.
-     *
-     * To use this, this may look something like this:
-     *
-     * $event = $calendar->VEVENT;
-     *
-     * @param string $name
-     *
-     * @return Property|null
-     */
-    public function __get($name)
-    {
-        if ('children' === $name) {
-            throw new \RuntimeException('Starting sabre/vobject 4.0 the children property is now protected. You should use the children() method instead');
-        }
-
-        $matches = $this->select($name);
-        if (0 === count($matches)) {
-            return;
-        } else {
-            $firstMatch = current($matches);
-            /* @var $firstMatch Property */
-            $firstMatch->setIterator(new ElementList(array_values($matches)));
-
-            return $firstMatch;
-        }
-    }
-
-    /**
-     * This method checks if a sub-element with the specified name exists.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function __isset($name)
-    {
-        $matches = $this->select($name);
-
-        return count($matches) > 0;
-    }
-
-    /**
-     * Using the setter method you can add properties or subcomponents.
-     *
-     * You can either pass a Component, Property
-     * object, or a string to automatically create a Property.
-     *
-     * If the item already exists, it will be removed. If you want to add
-     * a new item with the same name, always use the add() method.
-     *
-     * @param string $name
-     * @param mixed  $value
-     */
-    public function __set($name, $value)
-    {
-        $name = strtoupper($name);
-        $this->remove($name);
-        if ($value instanceof self || $value instanceof Property) {
-            $this->add($value);
-        } else {
-            $this->add($name, $value);
-        }
-    }
-
-    /**
-     * Removes all properties and components within this component with the
-     * specified name.
-     *
-     * @param string $name
-     */
-    public function __unset($name)
-    {
-        $this->remove($name);
-    }
-
-    /* }}} */
-
-    /**
-     * This method is automatically called when the object is cloned.
-     * Specifically, this will ensure all child elements are also cloned.
-     */
-    public function __clone()
-    {
-        foreach ($this->children as $childName => $childGroup) {
-            foreach ($childGroup as $key => $child) {
-                $clonedChild = clone $child;
-                $clonedChild->parent = $this;
-                $clonedChild->root = $this->root;
-                $this->children[$childName][$key] = $clonedChild;
-            }
-        }
-    }
-
-    /**
-     * 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.
-     *
-     * It is also possible to specify defaults and severity levels for
-     * violating the rule.
-     *
-     * See the VEVENT implementation for getValidationRules for a more complex
-     * example.
-     *
-     * @var array
-     */
-    public function getValidationRules()
-    {
-        return [];
-    }
-
-    /**
-     * 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)
-    {
-        $rules = $this->getValidationRules();
-        $defaults = $this->getDefaults();
-
-        $propertyCounters = [];
-
-        $messages = [];
-
-        foreach ($this->children() as $child) {
-            $name = strtoupper($child->name);
-            if (!isset($propertyCounters[$name])) {
-                $propertyCounters[$name] = 1;
-            } else {
-                ++$propertyCounters[$name];
-            }
-            $messages = array_merge($messages, $child->validate($options));
-        }
-
-        foreach ($rules as $propName => $rule) {
-            switch ($rule) {
-                case '0':
-                    if (isset($propertyCounters[$propName])) {
-                        $messages[] = [
-                            'level' => 3,
-                            'message' => $propName.' MUST NOT appear in a '.$this->name.' component',
-                            'node' => $this,
-                        ];
-                    }
-                    break;
-                case '1':
-                    if (!isset($propertyCounters[$propName]) || 1 !== $propertyCounters[$propName]) {
-                        $repaired = false;
-                        if ($options & self::REPAIR && isset($defaults[$propName])) {
-                            $this->add($propName, $defaults[$propName]);
-                            $repaired = true;
-                        }
-                        $messages[] = [
-                            'level' => $repaired ? 1 : 3,
-                            'message' => $propName.' MUST appear exactly once in a '.$this->name.' component',
-                            'node' => $this,
-                        ];
-                    }
-                    break;
-                case '+':
-                    if (!isset($propertyCounters[$propName]) || $propertyCounters[$propName] < 1) {
-                        $messages[] = [
-                            'level' => 3,
-                            'message' => $propName.' MUST appear at least once in a '.$this->name.' component',
-                            'node' => $this,
-                        ];
-                    }
-                    break;
-                case '*':
-                    break;
-                case '?':
-                    if (isset($propertyCounters[$propName]) && $propertyCounters[$propName] > 1) {
-                        $level = 3;
-
-                        // We try to repair the same property appearing multiple times with the exact same value
-                        // by removing the duplicates and keeping only one property
-                        if ($options & self::REPAIR) {
-                            $properties = array_unique($this->select($propName), SORT_REGULAR);
-
-                            if (1 === count($properties)) {
-                                $this->remove($propName);
-                                $this->add($properties[0]);
-
-                                $level = 1;
-                            }
-                        }
-
-                        $messages[] = [
-                            'level' => $level,
-                            'message' => $propName.' MUST NOT appear more than once in a '.$this->name.' component',
-                            'node' => $this,
-                        ];
-                    }
-                    break;
-            }
-        }
-
-        return $messages;
-    }
-
-    /**
-     * Call this method on a document if you're done using it.
-     *
-     * It's intended to remove all circular references, so PHP can easily clean
-     * it up.
-     */
-    public function destroy()
-    {
-        parent::destroy();
-        foreach ($this->children as $childGroup) {
-            foreach ($childGroup as $child) {
-                $child->destroy();
-            }
-        }
-        $this->children = [];
-    }
+	/**
+	 * Component name.
+	 *
+	 * This will contain a string such as VEVENT, VTODO, VCALENDAR, VCARD.
+	 *
+	 * @var string
+	 */
+	public $name;
+
+	/**
+	 * A list of properties and/or sub-components.
+	 *
+	 * @var array<string, Component|Property>
+	 */
+	protected $children = [];
+
+	/**
+	 * Creates a new component.
+	 *
+	 * You can specify the children either in key=>value syntax, in which case
+	 * properties will automatically be created, or you can just pass a list of
+	 * Component and Property object.
+	 *
+	 * By default, a set of sensible values will be added to the component. For
+	 * an iCalendar object, this may be something like CALSCALE:GREGORIAN. To
+	 * ensure that this does not happen, set $defaults to false.
+	 *
+	 * @param string|null $name     such as VCALENDAR, VEVENT
+	 * @param bool        $defaults
+	 */
+	public function __construct(Document $root, $name, array $children = [], $defaults = true)
+	{
+		$this->name = isset($name) ? strtoupper($name) : '';
+		$this->root = $root;
+
+		if ($defaults) {
+			// This is a terribly convoluted way to do this, but this ensures
+			// that the order of properties as they are specified in both
+			// defaults and the childrens list, are inserted in the object in a
+			// natural way.
+			$list = $this->getDefaults();
+			$nodes = [];
+			foreach ($children as $key => $value) {
+				if ($value instanceof Node) {
+					if (isset($list[$value->name])) {
+						unset($list[$value->name]);
+					}
+					$nodes[] = $value;
+				} else {
+					$list[$key] = $value;
+				}
+			}
+			foreach ($list as $key => $value) {
+				$this->add($key, $value);
+			}
+			foreach ($nodes as $node) {
+				$this->add($node);
+			}
+		} else {
+			foreach ($children as $k => $child) {
+				if ($child instanceof Node) {
+					// Component or Property
+					$this->add($child);
+				} else {
+					// Property key=>value
+					$this->add($k, $child);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Adds a new property or component, and returns the new item.
+	 *
+	 * This method has 3 possible signatures:
+	 *
+	 * add(Component $comp) // Adds a new component
+	 * add(Property $prop)  // Adds a new property
+	 * add($name, $value, array $parameters = []) // Adds a new property
+	 * add($name, array $children = []) // Adds a new component
+	 * by name.
+	 *
+	 * @return Node
+	 */
+	public function add()
+	{
+		$arguments = func_get_args();
+
+		if ($arguments[0] instanceof Node) {
+			if (isset($arguments[1])) {
+				throw new \InvalidArgumentException('The second argument must not be specified, when passing a VObject Node');
+			}
+			$arguments[0]->parent = $this;
+			$newNode = $arguments[0];
+		} elseif (is_string($arguments[0])) {
+			$newNode = call_user_func_array([$this->root, 'create'], $arguments);
+		} else {
+			throw new \InvalidArgumentException('The first argument must either be a \\Sabre\\VObject\\Node or a string');
+		}
+
+		$name = $newNode->name;
+		if (isset($this->children[$name])) {
+			$this->children[$name][] = $newNode;
+		} else {
+			$this->children[$name] = [$newNode];
+		}
+
+		return $newNode;
+	}
+
+	/**
+	 * This method removes a component or property from this component.
+	 *
+	 * You can either specify the item by name (like DTSTART), in which case
+	 * all properties/components with that name will be removed, or you can
+	 * pass an instance of a property or component, in which case only that
+	 * exact item will be removed.
+	 *
+	 * @param string|Property|Component $item
+	 */
+	public function remove($item)
+	{
+		if (is_string($item)) {
+			// If there's no dot in the name, it's an exact property name and
+			// we can just wipe out all those properties.
+			//
+			if (false === strpos($item, '.')) {
+				unset($this->children[strtoupper($item)]);
+
+				return;
+			}
+			// If there was a dot, we need to ask select() to help us out and
+			// then we just call remove recursively.
+			foreach ($this->select($item) as $child) {
+				$this->remove($child);
+			}
+		} else {
+			foreach ($this->select($item->name) as $k => $child) {
+				if ($child === $item) {
+					unset($this->children[$item->name][$k]);
+
+					return;
+				}
+			}
+
+			throw new \InvalidArgumentException('The item you passed to remove() was not a child of this component');
+		}
+	}
+
+	/**
+	 * Returns a flat list of all the properties and components in this
+	 * component.
+	 *
+	 * @return array
+	 */
+	public function children()
+	{
+		$result = [];
+		foreach ($this->children as $childGroup) {
+			$result = array_merge($result, $childGroup);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * This method only returns a list of sub-components. Properties are
+	 * ignored.
+	 *
+	 * @return array
+	 */
+	public function getComponents()
+	{
+		$result = [];
+
+		foreach ($this->children as $childGroup) {
+			foreach ($childGroup as $child) {
+				if ($child instanceof self) {
+					$result[] = $child;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns an array with elements that match the specified name.
+	 *
+	 * This function is also aware of MIME-Directory groups (as they appear in
+	 * vcards). This means that if a property is grouped as "HOME.EMAIL", it
+	 * will also be returned when searching for just "EMAIL". If you want to
+	 * search for a property in a specific group, you can select on the entire
+	 * string ("HOME.EMAIL"). If you want to search on a specific property that
+	 * has not been assigned a group, specify ".EMAIL".
+	 *
+	 * @param string $name
+	 *
+	 * @return array
+	 */
+	public function select($name)
+	{
+		$group = null;
+		$name = strtoupper($name);
+		if (false !== strpos($name, '.')) {
+			list($group, $name) = explode('.', $name, 2);
+		}
+		if ('' === $name) {
+			$name = null;
+		}
+
+		if (!is_null($name)) {
+			$result = isset($this->children[$name]) ? $this->children[$name] : [];
+
+			if (is_null($group)) {
+				return $result;
+			} else {
+				// If we have a group filter as well, we need to narrow it down
+				// more.
+				return array_filter(
+					$result,
+					function ($child) use ($group) {
+						return $child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group;
+					}
+				);
+			}
+		}
+
+		// If we got to this point, it means there was no 'name' specified for
+		// searching, implying that this is a group-only search.
+		$result = [];
+		foreach ($this->children as $childGroup) {
+			foreach ($childGroup as $child) {
+				if ($child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group) {
+					$result[] = $child;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Turns the object back into a serialized blob.
+	 *
+	 * @return string
+	 */
+	public function serialize()
+	{
+		$str = 'BEGIN:'.$this->name."\r\n";
+
+		/**
+		 * Gives a component a 'score' for sorting purposes.
+		 *
+		 * This is solely used by the childrenSort method.
+		 *
+		 * A higher score means the item will be lower in the list.
+		 * To avoid score collisions, each "score category" has a reasonable
+		 * space to accommodate elements. The $key is added to the $score to
+		 * preserve the original relative order of elements.
+		 *
+		 * @param int   $key
+		 * @param array $array
+		 *
+		 * @return int
+		 */
+		$sortScore = function ($key, $array) {
+			if ($array[$key] instanceof Component) {
+				// We want to encode VTIMEZONE first, this is a personal
+				// preference.
+				if ('VTIMEZONE' === $array[$key]->name) {
+					$score = 300000000;
+
+					return $score + $key;
+				} else {
+					$score = 400000000;
+
+					return $score + $key;
+				}
+			} else {
+				// Properties get encoded first
+				// VCARD version 4.0 wants the VERSION property to appear first
+				if ($array[$key] instanceof Property) {
+					if ('VERSION' === $array[$key]->name) {
+						$score = 100000000;
+
+						return $score + $key;
+					} else {
+						// All other properties
+						$score = 200000000;
+
+						return $score + $key;
+					}
+				}
+			}
+		};
+
+		$children = $this->children();
+		$tmp = $children;
+		uksort(
+			$children,
+			function ($a, $b) use ($sortScore, $tmp) {
+				$sA = $sortScore($a, $tmp);
+				$sB = $sortScore($b, $tmp);
+
+				return $sA - $sB;
+			}
+		);
+
+		foreach ($children as $child) {
+			$str .= $child->serialize();
+		}
+		$str .= 'END:'.$this->name."\r\n";
+
+		return $str;
+	}
+
+	/**
+	 * 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()
+	{
+		$components = [];
+		$properties = [];
+
+		foreach ($this->children as $childGroup) {
+			foreach ($childGroup as $child) {
+				if ($child instanceof self) {
+					$components[] = $child->jsonSerialize();
+				} else {
+					$properties[] = $child->jsonSerialize();
+				}
+			}
+		}
+
+		return [
+			strtolower($this->name),
+			$properties,
+			$components,
+		];
+	}
+
+	/**
+	 * 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
+	{
+		$components = [];
+		$properties = [];
+
+		foreach ($this->children as $childGroup) {
+			foreach ($childGroup as $child) {
+				if ($child instanceof self) {
+					$components[] = $child;
+				} else {
+					$properties[] = $child;
+				}
+			}
+		}
+
+		$writer->startElement(strtolower($this->name));
+
+		if (!empty($properties)) {
+			$writer->startElement('properties');
+
+			foreach ($properties as $property) {
+				$property->xmlSerialize($writer);
+			}
+
+			$writer->endElement();
+		}
+
+		if (!empty($components)) {
+			$writer->startElement('components');
+
+			foreach ($components as $component) {
+				$component->xmlSerialize($writer);
+			}
+
+			$writer->endElement();
+		}
+
+		$writer->endElement();
+	}
+
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults()
+	{
+		return [];
+	}
+
+	/* Magic property accessors {{{ */
+
+	/**
+	 * Using 'get' you will either get a property or component.
+	 *
+	 * If there were no child-elements found with the specified name,
+	 * null is returned.
+	 *
+	 * To use this, this may look something like this:
+	 *
+	 * $event = $calendar->VEVENT;
+	 *
+	 * @param string $name
+	 *
+	 * @return Property|null
+	 */
+	public function __get($name)
+	{
+		if ('children' === $name) {
+			throw new \RuntimeException('Starting sabre/vobject 4.0 the children property is now protected. You should use the children() method instead');
+		}
+
+		$matches = $this->select($name);
+		if (0 === count($matches)) {
+			return;
+		} else {
+			$firstMatch = current($matches);
+			/* @var $firstMatch Property */
+			$firstMatch->setIterator(new ElementList(array_values($matches)));
+
+			return $firstMatch;
+		}
+	}
+
+	/**
+	 * This method checks if a sub-element with the specified name exists.
+	 *
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function __isset($name)
+	{
+		$matches = $this->select($name);
+
+		return count($matches) > 0;
+	}
+
+	/**
+	 * Using the setter method you can add properties or subcomponents.
+	 *
+	 * You can either pass a Component, Property
+	 * object, or a string to automatically create a Property.
+	 *
+	 * If the item already exists, it will be removed. If you want to add
+	 * a new item with the same name, always use the add() method.
+	 *
+	 * @param string $name
+	 * @param mixed  $value
+	 */
+	public function __set($name, $value)
+	{
+		$name = strtoupper($name);
+		$this->remove($name);
+		if ($value instanceof self || $value instanceof Property) {
+			$this->add($value);
+		} else {
+			$this->add($name, $value);
+		}
+	}
+
+	/**
+	 * Removes all properties and components within this component with the
+	 * specified name.
+	 *
+	 * @param string $name
+	 */
+	public function __unset($name)
+	{
+		$this->remove($name);
+	}
+
+	/* }}} */
+
+	/**
+	 * This method is automatically called when the object is cloned.
+	 * Specifically, this will ensure all child elements are also cloned.
+	 */
+	public function __clone()
+	{
+		foreach ($this->children as $childName => $childGroup) {
+			foreach ($childGroup as $key => $child) {
+				$clonedChild = clone $child;
+				$clonedChild->parent = $this;
+				$clonedChild->root = $this->root;
+				$this->children[$childName][$key] = $clonedChild;
+			}
+		}
+	}
+
+	/**
+	 * 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.
+	 *
+	 * It is also possible to specify defaults and severity levels for
+	 * violating the rule.
+	 *
+	 * See the VEVENT implementation for getValidationRules for a more complex
+	 * example.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules()
+	{
+		return [];
+	}
+
+	/**
+	 * 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)
+	{
+		$rules = $this->getValidationRules();
+		$defaults = $this->getDefaults();
+
+		$propertyCounters = [];
+
+		$messages = [];
+
+		foreach ($this->children() as $child) {
+			$name = strtoupper($child->name);
+			if (!isset($propertyCounters[$name])) {
+				$propertyCounters[$name] = 1;
+			} else {
+				++$propertyCounters[$name];
+			}
+			$messages = array_merge($messages, $child->validate($options));
+		}
+
+		foreach ($rules as $propName => $rule) {
+			switch ($rule) {
+				case '0':
+					if (isset($propertyCounters[$propName])) {
+						$messages[] = [
+							'level' => 3,
+							'message' => $propName.' MUST NOT appear in a '.$this->name.' component',
+							'node' => $this,
+						];
+					}
+					break;
+				case '1':
+					if (!isset($propertyCounters[$propName]) || 1 !== $propertyCounters[$propName]) {
+						$repaired = false;
+						if ($options & self::REPAIR && isset($defaults[$propName])) {
+							$this->add($propName, $defaults[$propName]);
+							$repaired = true;
+						}
+						$messages[] = [
+							'level' => $repaired ? 1 : 3,
+							'message' => $propName.' MUST appear exactly once in a '.$this->name.' component',
+							'node' => $this,
+						];
+					}
+					break;
+				case '+':
+					if (!isset($propertyCounters[$propName]) || $propertyCounters[$propName] < 1) {
+						$messages[] = [
+							'level' => 3,
+							'message' => $propName.' MUST appear at least once in a '.$this->name.' component',
+							'node' => $this,
+						];
+					}
+					break;
+				case '*':
+					break;
+				case '?':
+					if (isset($propertyCounters[$propName]) && $propertyCounters[$propName] > 1) {
+						$level = 3;
+
+						// We try to repair the same property appearing multiple times with the exact same value
+						// by removing the duplicates and keeping only one property
+						if ($options & self::REPAIR) {
+							$properties = array_unique($this->select($propName), SORT_REGULAR);
+
+							if (1 === count($properties)) {
+								$this->remove($propName);
+								$this->add($properties[0]);
+
+								$level = 1;
+							}
+						}
+
+						$messages[] = [
+							'level' => $level,
+							'message' => $propName.' MUST NOT appear more than once in a '.$this->name.' component',
+							'node' => $this,
+						];
+					}
+					break;
+			}
+		}
+
+		return $messages;
+	}
+
+	/**
+	 * Call this method on a document if you're done using it.
+	 *
+	 * It's intended to remove all circular references, so PHP can easily clean
+	 * it up.
+	 */
+	public function destroy()
+	{
+		parent::destroy();
+		foreach ($this->children as $childGroup) {
+			foreach ($childGroup as $child) {
+				$child->destroy();
+			}
+		}
+		$this->children = [];
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/TimezoneGuesser/TimezoneFinder.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 
 interface TimezoneFinder
 {
-    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone;
+	public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone;
 }

htdocs/includes/sabre/sabre/vobject/lib/TimezoneGuesser/FindFromTimezoneIdentifier.php

Indentation +53 added lines, -53 removed lines

@@ -12,60 +12,60 @@
  */
 class FindFromTimezoneIdentifier implements TimezoneFinder
 {
-    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
-    {
-        // First we will just see if the tzid is a support timezone identifier.
-        //
-        // The only exception is if the timezone starts with (. This is to
-        // handle cases where certain microsoft products generate timezone
-        // identifiers that for instance look like:
-        //
-        // (GMT+01.00) Sarajevo/Warsaw/Zagreb
-        //
-        // Since PHP 5.5.10, the first bit will be used as the timezone and
-        // this method will return just GMT+01:00. This is wrong, because it
-        // doesn't take DST into account
-        if (!isset($tzid[0])) {
-            return null;
-        }
-        if ('(' === $tzid[0]) {
-            return null;
-        }
-        // PHP has a bug that logs PHP warnings even it shouldn't:
-        // https://bugs.php.net/bug.php?id=67881
-        //
-        // That's why we're checking if we'll be able to successfully instantiate
-        // \DateTimeZone() before doing so. Otherwise we could simply instantiate
-        // and catch the exception.
-        $tzIdentifiers = DateTimeZone::listIdentifiers();
+	public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
+	{
+		// First we will just see if the tzid is a support timezone identifier.
+		//
+		// The only exception is if the timezone starts with (. This is to
+		// handle cases where certain microsoft products generate timezone
+		// identifiers that for instance look like:
+		//
+		// (GMT+01.00) Sarajevo/Warsaw/Zagreb
+		//
+		// Since PHP 5.5.10, the first bit will be used as the timezone and
+		// this method will return just GMT+01:00. This is wrong, because it
+		// doesn't take DST into account
+		if (!isset($tzid[0])) {
+			return null;
+		}
+		if ('(' === $tzid[0]) {
+			return null;
+		}
+		// PHP has a bug that logs PHP warnings even it shouldn't:
+		// https://bugs.php.net/bug.php?id=67881
+		//
+		// That's why we're checking if we'll be able to successfully instantiate
+		// \DateTimeZone() before doing so. Otherwise we could simply instantiate
+		// and catch the exception.
+		$tzIdentifiers = DateTimeZone::listIdentifiers();
 
-        try {
-            if (
-                (in_array($tzid, $tzIdentifiers)) ||
-                (preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)) ||
-                (in_array($tzid, $this->getIdentifiersBC()))
-            ) {
-                return new DateTimeZone($tzid);
-            }
-        } catch (Exception $e) {
-        }
+		try {
+			if (
+				(in_array($tzid, $tzIdentifiers)) ||
+				(preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)) ||
+				(in_array($tzid, $this->getIdentifiersBC()))
+			) {
+				return new DateTimeZone($tzid);
+			}
+		} catch (Exception $e) {
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * This method returns an array of timezone identifiers, that are supported
-     * by DateTimeZone(), but not returned by DateTimeZone::listIdentifiers().
-     *
-     * We're not using DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC) because:
-     * - It's not supported by some PHP versions as well as HHVM.
-     * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
-     * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
-     *
-     * @return array
-     */
-    private function getIdentifiersBC()
-    {
-        return include __DIR__.'/../timezonedata/php-bc.php';
-    }
+	/**
+	 * This method returns an array of timezone identifiers, that are supported
+	 * by DateTimeZone(), but not returned by DateTimeZone::listIdentifiers().
+	 *
+	 * We're not using DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC) because:
+	 * - It's not supported by some PHP versions as well as HHVM.
+	 * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
+	 * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
+	 *
+	 * @return array
+	 */
+	private function getIdentifiersBC()
+	{
+		return include __DIR__.'/../timezonedata/php-bc.php';
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/TimezoneGuesser/GuessFromMsTzId.php

Indentation +102 added lines, -102 removed lines

@@ -9,111 +9,111 @@
 
 class GuessFromMsTzId implements TimezoneGuesser
 {
-    /**
-     * List of microsoft exchange timezone ids.
-     *
-     * Source: http://msdn.microsoft.com/en-us/library/aa563018(loband).aspx
-     */
-    public static $microsoftExchangeMap = [
-        0 => 'UTC',
-        31 => 'Africa/Casablanca',
+	/**
+	 * List of microsoft exchange timezone ids.
+	 *
+	 * Source: http://msdn.microsoft.com/en-us/library/aa563018(loband).aspx
+	 */
+	public static $microsoftExchangeMap = [
+		0 => 'UTC',
+		31 => 'Africa/Casablanca',
 
-        // Insanely, id #2 is used for both Europe/Lisbon, and Europe/Sarajevo.
-        // I'm not even kidding.. We handle this special case in the
-        // getTimeZone method.
-        2 => 'Europe/Lisbon',
-        1 => 'Europe/London',
-        4 => 'Europe/Berlin',
-        6 => 'Europe/Prague',
-        3 => 'Europe/Paris',
-        69 => 'Africa/Luanda', // This was a best guess
-        7 => 'Europe/Athens',
-        5 => 'Europe/Bucharest',
-        49 => 'Africa/Cairo',
-        50 => 'Africa/Harare',
-        59 => 'Europe/Helsinki',
-        27 => 'Asia/Jerusalem',
-        26 => 'Asia/Baghdad',
-        74 => 'Asia/Kuwait',
-        51 => 'Europe/Moscow',
-        56 => 'Africa/Nairobi',
-        25 => 'Asia/Tehran',
-        24 => 'Asia/Muscat', // Best guess
-        54 => 'Asia/Baku',
-        48 => 'Asia/Kabul',
-        58 => 'Asia/Yekaterinburg',
-        47 => 'Asia/Karachi',
-        23 => 'Asia/Calcutta',
-        62 => 'Asia/Kathmandu',
-        46 => 'Asia/Almaty',
-        71 => 'Asia/Dhaka',
-        66 => 'Asia/Colombo',
-        61 => 'Asia/Rangoon',
-        22 => 'Asia/Bangkok',
-        64 => 'Asia/Krasnoyarsk',
-        45 => 'Asia/Shanghai',
-        63 => 'Asia/Irkutsk',
-        21 => 'Asia/Singapore',
-        73 => 'Australia/Perth',
-        75 => 'Asia/Taipei',
-        20 => 'Asia/Tokyo',
-        72 => 'Asia/Seoul',
-        70 => 'Asia/Yakutsk',
-        19 => 'Australia/Adelaide',
-        44 => 'Australia/Darwin',
-        18 => 'Australia/Brisbane',
-        76 => 'Australia/Sydney',
-        43 => 'Pacific/Guam',
-        42 => 'Australia/Hobart',
-        68 => 'Asia/Vladivostok',
-        41 => 'Asia/Magadan',
-        17 => 'Pacific/Auckland',
-        40 => 'Pacific/Fiji',
-        67 => 'Pacific/Tongatapu',
-        29 => 'Atlantic/Azores',
-        53 => 'Atlantic/Cape_Verde',
-        30 => 'America/Noronha',
-        8 => 'America/Sao_Paulo', // Best guess
-        32 => 'America/Argentina/Buenos_Aires',
-        60 => 'America/Godthab',
-        28 => 'America/St_Johns',
-        9 => 'America/Halifax',
-        33 => 'America/Caracas',
-        65 => 'America/Santiago',
-        35 => 'America/Bogota',
-        10 => 'America/New_York',
-        34 => 'America/Indiana/Indianapolis',
-        55 => 'America/Guatemala',
-        11 => 'America/Chicago',
-        37 => 'America/Mexico_City',
-        36 => 'America/Edmonton',
-        38 => 'America/Phoenix',
-        12 => 'America/Denver', // Best guess
-        13 => 'America/Los_Angeles', // Best guess
-        14 => 'America/Anchorage',
-        15 => 'Pacific/Honolulu',
-        16 => 'Pacific/Midway',
-        39 => 'Pacific/Kwajalein',
-    ];
+		// Insanely, id #2 is used for both Europe/Lisbon, and Europe/Sarajevo.
+		// I'm not even kidding.. We handle this special case in the
+		// getTimeZone method.
+		2 => 'Europe/Lisbon',
+		1 => 'Europe/London',
+		4 => 'Europe/Berlin',
+		6 => 'Europe/Prague',
+		3 => 'Europe/Paris',
+		69 => 'Africa/Luanda', // This was a best guess
+		7 => 'Europe/Athens',
+		5 => 'Europe/Bucharest',
+		49 => 'Africa/Cairo',
+		50 => 'Africa/Harare',
+		59 => 'Europe/Helsinki',
+		27 => 'Asia/Jerusalem',
+		26 => 'Asia/Baghdad',
+		74 => 'Asia/Kuwait',
+		51 => 'Europe/Moscow',
+		56 => 'Africa/Nairobi',
+		25 => 'Asia/Tehran',
+		24 => 'Asia/Muscat', // Best guess
+		54 => 'Asia/Baku',
+		48 => 'Asia/Kabul',
+		58 => 'Asia/Yekaterinburg',
+		47 => 'Asia/Karachi',
+		23 => 'Asia/Calcutta',
+		62 => 'Asia/Kathmandu',
+		46 => 'Asia/Almaty',
+		71 => 'Asia/Dhaka',
+		66 => 'Asia/Colombo',
+		61 => 'Asia/Rangoon',
+		22 => 'Asia/Bangkok',
+		64 => 'Asia/Krasnoyarsk',
+		45 => 'Asia/Shanghai',
+		63 => 'Asia/Irkutsk',
+		21 => 'Asia/Singapore',
+		73 => 'Australia/Perth',
+		75 => 'Asia/Taipei',
+		20 => 'Asia/Tokyo',
+		72 => 'Asia/Seoul',
+		70 => 'Asia/Yakutsk',
+		19 => 'Australia/Adelaide',
+		44 => 'Australia/Darwin',
+		18 => 'Australia/Brisbane',
+		76 => 'Australia/Sydney',
+		43 => 'Pacific/Guam',
+		42 => 'Australia/Hobart',
+		68 => 'Asia/Vladivostok',
+		41 => 'Asia/Magadan',
+		17 => 'Pacific/Auckland',
+		40 => 'Pacific/Fiji',
+		67 => 'Pacific/Tongatapu',
+		29 => 'Atlantic/Azores',
+		53 => 'Atlantic/Cape_Verde',
+		30 => 'America/Noronha',
+		8 => 'America/Sao_Paulo', // Best guess
+		32 => 'America/Argentina/Buenos_Aires',
+		60 => 'America/Godthab',
+		28 => 'America/St_Johns',
+		9 => 'America/Halifax',
+		33 => 'America/Caracas',
+		65 => 'America/Santiago',
+		35 => 'America/Bogota',
+		10 => 'America/New_York',
+		34 => 'America/Indiana/Indianapolis',
+		55 => 'America/Guatemala',
+		11 => 'America/Chicago',
+		37 => 'America/Mexico_City',
+		36 => 'America/Edmonton',
+		38 => 'America/Phoenix',
+		12 => 'America/Denver', // Best guess
+		13 => 'America/Los_Angeles', // Best guess
+		14 => 'America/Anchorage',
+		15 => 'Pacific/Honolulu',
+		16 => 'Pacific/Midway',
+		39 => 'Pacific/Kwajalein',
+	];
 
-    public function guess(VTimeZone $vtimezone, bool $throwIfUnsure = false): ?DateTimeZone
-    {
-        // Microsoft may add a magic number, which we also have an
-        // answer for.
-        if (!isset($vtimezone->{'X-MICROSOFT-CDO-TZID'})) {
-            return null;
-        }
-        $cdoId = (int) $vtimezone->{'X-MICROSOFT-CDO-TZID'}->getValue();
+	public function guess(VTimeZone $vtimezone, bool $throwIfUnsure = false): ?DateTimeZone
+	{
+		// Microsoft may add a magic number, which we also have an
+		// answer for.
+		if (!isset($vtimezone->{'X-MICROSOFT-CDO-TZID'})) {
+			return null;
+		}
+		$cdoId = (int) $vtimezone->{'X-MICROSOFT-CDO-TZID'}->getValue();
 
-        // 2 can mean both Europe/Lisbon and Europe/Sarajevo.
-        if (2 === $cdoId && false !== strpos((string) $vtimezone->TZID, 'Sarajevo')) {
-            return new DateTimeZone('Europe/Sarajevo');
-        }
+		// 2 can mean both Europe/Lisbon and Europe/Sarajevo.
+		if (2 === $cdoId && false !== strpos((string) $vtimezone->TZID, 'Sarajevo')) {
+			return new DateTimeZone('Europe/Sarajevo');
+		}
 
-        if (isset(self::$microsoftExchangeMap[$cdoId])) {
-            return new DateTimeZone(self::$microsoftExchangeMap[$cdoId]);
-        }
+		if (isset(self::$microsoftExchangeMap[$cdoId])) {
+			return new DateTimeZone(self::$microsoftExchangeMap[$cdoId]);
+		}
 
-        return null;
-    }
+		return null;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/TimezoneGuesser/FindFromTimezoneMap.php

Indentation +56 added lines, -56 removed lines

@@ -11,68 +11,68 @@
  */
 class FindFromTimezoneMap implements TimezoneFinder
 {
-    private $map = [];
+	private $map = [];
 
-    private $patterns = [
-        '/^\((UTC|GMT)(\+|\-)[\d]{2}\:[\d]{2}\) (.*)/',
-        '/^\((UTC|GMT)(\+|\-)[\d]{2}\.[\d]{2}\) (.*)/',
-    ];
+	private $patterns = [
+		'/^\((UTC|GMT)(\+|\-)[\d]{2}\:[\d]{2}\) (.*)/',
+		'/^\((UTC|GMT)(\+|\-)[\d]{2}\.[\d]{2}\) (.*)/',
+	];
 
-    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
-    {
-        // Next, we check if the tzid is somewhere in our tzid map.
-        if ($this->hasTzInMap($tzid)) {
-            return new DateTimeZone($this->getTzFromMap($tzid));
-        }
+	public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
+	{
+		// Next, we check if the tzid is somewhere in our tzid map.
+		if ($this->hasTzInMap($tzid)) {
+			return new DateTimeZone($this->getTzFromMap($tzid));
+		}
 
-        // Some Microsoft products prefix the offset first, so let's strip that off
-        // and see if it is our tzid map.  We don't want to check for this first just
-        // in case there are overrides in our tzid map.
-        foreach ($this->patterns as $pattern) {
-            if (!preg_match($pattern, $tzid, $matches)) {
-                continue;
-            }
-            $tzidAlternate = $matches[3];
-            if ($this->hasTzInMap($tzidAlternate)) {
-                return new DateTimeZone($this->getTzFromMap($tzidAlternate));
-            }
-        }
+		// Some Microsoft products prefix the offset first, so let's strip that off
+		// and see if it is our tzid map.  We don't want to check for this first just
+		// in case there are overrides in our tzid map.
+		foreach ($this->patterns as $pattern) {
+			if (!preg_match($pattern, $tzid, $matches)) {
+				continue;
+			}
+			$tzidAlternate = $matches[3];
+			if ($this->hasTzInMap($tzidAlternate)) {
+				return new DateTimeZone($this->getTzFromMap($tzidAlternate));
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * This method returns an array of timezone identifiers, that are supported
-     * by DateTimeZone(), but not returned by DateTimeZone::listIdentifiers().
-     *
-     * We're not using DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC) because:
-     * - It's not supported by some PHP versions as well as HHVM.
-     * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
-     * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
-     *
-     * @return array
-     */
-    private function getTzMaps()
-    {
-        if ([] === $this->map) {
-            $this->map = array_merge(
-                include __DIR__.'/../timezonedata/windowszones.php',
-                include __DIR__.'/../timezonedata/lotuszones.php',
-                include __DIR__.'/../timezonedata/exchangezones.php',
-                include __DIR__.'/../timezonedata/php-workaround.php'
-            );
-        }
+	/**
+	 * This method returns an array of timezone identifiers, that are supported
+	 * by DateTimeZone(), but not returned by DateTimeZone::listIdentifiers().
+	 *
+	 * We're not using DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC) because:
+	 * - It's not supported by some PHP versions as well as HHVM.
+	 * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
+	 * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
+	 *
+	 * @return array
+	 */
+	private function getTzMaps()
+	{
+		if ([] === $this->map) {
+			$this->map = array_merge(
+				include __DIR__.'/../timezonedata/windowszones.php',
+				include __DIR__.'/../timezonedata/lotuszones.php',
+				include __DIR__.'/../timezonedata/exchangezones.php',
+				include __DIR__.'/../timezonedata/php-workaround.php'
+			);
+		}
 
-        return $this->map;
-    }
+		return $this->map;
+	}
 
-    private function getTzFromMap(string $tzid): string
-    {
-        return $this->getTzMaps()[$tzid];
-    }
+	private function getTzFromMap(string $tzid): string
+	{
+		return $this->getTzMaps()[$tzid];
+	}
 
-    private function hasTzInMap(string $tzid): bool
-    {
-        return isset($this->getTzMaps()[$tzid]);
-    }
+	private function hasTzInMap(string $tzid): bool
+	{
+		return isset($this->getTzMaps()[$tzid]);
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/TimezoneGuesser/FindFromOffset.php

Indentation +16 added lines, -16 removed lines

@@ -11,21 +11,21 @@
  */
 class FindFromOffset implements TimezoneFinder
 {
-    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
-    {
-        // Maybe the author was hyper-lazy and just included an offset. We
-        // support it, but we aren't happy about it.
-        if (preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)) {
-            // Note that the path in the source will never be taken from PHP 5.5.10
-            // onwards. PHP 5.5.10 supports the "GMT+0100" style of format, so it
-            // already gets returned early in this function. Once we drop support
-            // for versions under PHP 5.5.10, this bit can be taken out of the
-            // source.
-            // @codeCoverageIgnoreStart
-            return new DateTimeZone('Etc/GMT'.$matches[1].ltrim(substr($matches[2], 0, 2), '0'));
-            // @codeCoverageIgnoreEnd
-        }
+	public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
+	{
+		// Maybe the author was hyper-lazy and just included an offset. We
+		// support it, but we aren't happy about it.
+		if (preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)) {
+			// Note that the path in the source will never be taken from PHP 5.5.10
+			// onwards. PHP 5.5.10 supports the "GMT+0100" style of format, so it
+			// already gets returned early in this function. Once we drop support
+			// for versions under PHP 5.5.10, this bit can be taken out of the
+			// source.
+			// @codeCoverageIgnoreStart
+			return new DateTimeZone('Etc/GMT'.$matches[1].ltrim(substr($matches[2], 0, 2), '0'));
+			// @codeCoverageIgnoreEnd
+		}
 
-        return null;
-    }
+		return null;
+	}
 }

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

Indentation +1 added lines, -1 removed lines

@@ -7,5 +7,5 @@
 
 interface TimezoneGuesser
 {
-    public function guess(VTimeZone $vtimezone, bool $failIfUncertain = false): ?DateTimeZone;
+	public function guess(VTimeZone $vtimezone, bool $failIfUncertain = false): ?DateTimeZone;
 }