diff --git a/sabre/dav/lib/CalDAV/ICSExportPlugin.php b/sabre/dav/lib/CalDAV/ICSExportPlugin.php index fc8b971f3..9b6093fbe 100644 --- a/sabre/dav/lib/CalDAV/ICSExportPlugin.php +++ b/sabre/dav/lib/CalDAV/ICSExportPlugin.php @@ -318,7 +318,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; diff --git a/sabre/dav/lib/DAV/CorePlugin.php b/sabre/dav/lib/DAV/CorePlugin.php index 676cdd04a..03b31db8a 100644 --- a/sabre/dav/lib/DAV/CorePlugin.php +++ b/sabre/dav/lib/DAV/CorePlugin.php @@ -321,7 +321,7 @@ function httpPropFind(RequestInterface $request, ResponseInterface $response) { try { $propFindXml = $this->server->xml->expect('{DAV:}propfind', $requestBody); } catch (ParseException $e) { - throw new BadRequest($e->getMessage(), null, $e); + throw new BadRequest($e->getMessage(), 0, $e); } } else { $propFindXml = new Xml\Request\PropFind(); @@ -378,7 +378,7 @@ function httpPropPatch(RequestInterface $request, ResponseInterface $response) { try { $propPatch = $this->server->xml->expect('{DAV:}propertyupdate', $request->getBody()); } catch (ParseException $e) { - throw new BadRequest($e->getMessage(), null, $e); + throw new BadRequest($e->getMessage(), 0, $e); } $newProperties = $propPatch->properties; diff --git a/sabre/vobject/lib/Component/VCard.php b/sabre/vobject/lib/Component/VCard.php index bca623d5e..2a2851f4e 100644 --- a/sabre/vobject/lib/Component/VCard.php +++ b/sabre/vobject/lib/Component/VCard.php @@ -511,7 +511,7 @@ function xmlSerialize(Xml\Writer $writer) { switch ($property->name) { case 'VERSION': - continue; + break; case 'XML': $value = $property->getParts(); diff --git a/sabre/vobject/lib/FreeBusyGenerator.php b/sabre/vobject/lib/FreeBusyGenerator.php index e30b136c4..ca77cb918 100644 --- a/sabre/vobject/lib/FreeBusyGenerator.php +++ b/sabre/vobject/lib/FreeBusyGenerator.php @@ -430,7 +430,7 @@ protected function calculateBusy(FreeBusyData $fbData, array $objects) { // instance. We are skipping this event from the output // entirely. unset($this->objects[$key]); - continue; + break; } if ($this->start) {