From 5eb5d74514230b11c80b67c7e147242757ccc660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 26 Sep 2018 10:05:14 +0200
Subject: [PATCH] Fix for php7.3 + adjusting PHPDoc

---
 lib/CalDAV/ICSExportPlugin.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/CalDAV/ICSExportPlugin.php b/lib/CalDAV/ICSExportPlugin.php
index eafb583620..6f84746cae 100644
--- a/lib/CalDAV/ICSExportPlugin.php
+++ b/lib/CalDAV/ICSExportPlugin.php
@@ -76,6 +76,9 @@ function initialize(DAV\Server $server) {
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
+     * @throws BadRequest
+     * @throws DAV\Exception\NotFound
+     * @throws VObject\InvalidDataException
      * @return bool
      */
     function httpGet(RequestInterface $request, ResponseInterface $response) {
@@ -166,6 +169,8 @@ function httpGet(RequestInterface $request, ResponseInterface $response) {
      * @param string $format
      * @param array $properties
      * @param ResponseInterface $response
+     * @throws DAV\Exception\NotFound
+     * @throws VObject\InvalidDataException
      */
     protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response) {
 
@@ -318,7 +323,9 @@ function mergeObjects(array $properties, array $inputObjects) {
                     // VTIMEZONE is special, because we need to filter out the duplicates
                     case 'VTIMEZONE' :
                         // Naively just checking tzid.
-                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
+                        if (in_array((string)$child->TZID, $collectedTimezones)) {
+                            break;
+                        }
 
                         $timezones[] = clone $child;
                         $collectedTimezones[] = $child->TZID;