Fix DAV types

Signed-off-by: jld3103 <jld3103yt@gmail.com>

diff --git a/apps/dav/lib/CalDAV/EventComparisonService.php b/apps/dav/lib/CalDAV/EventComparisonService.php
index 0fd4d08e83e9b4c8e1ea6a1ead84ff9f0c83c91e..d8d6ea07ed241cf11ecd6d7f5b2f2a5c450f11e9 100644 (file)
--- a/apps/dav/lib/CalDAV/EventComparisonService.php
+++ b/apps/dav/lib/CalDAV/EventComparisonService.php
@@ -90,7 +90,7 @@ class EventComparisonService {
         *
         * @param VCalendar $new
         * @param VCalendar|null $old
-        * @return array<string, VEvent[]>
+        * @return array<string, VEvent[]|null>
         */
        public function findModified(VCalendar $new, ?VCalendar $old): array {
                $newEventComponents = $new->getComponents();

diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
index ab21af1ce1048c25b82a1d2b2e526f1616837f4f..666f1e7a85c1b19482c30d19783b6f81bc1c153d 100644 (file)
--- a/apps/dav/lib/CardDAV/CardDavBackend.php
+++ b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -989,11 +989,12 @@ class CardDavBackend implements BackendInterface, SyncSupport {
         * @param string $pattern which should match within the $searchProperties
         * @param array $searchProperties defines the properties within the query pattern should match
         * @param array $options = array() to define the search behavior
+        *        - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
         *    - 'escape_like_param' - If set to false wildcards _ and % are not escaped, otherwise they are
         *    - 'limit' - Set a numeric limit for the search results
         *    - 'offset' - Set the offset for the limited search results
         *    - 'wildcard' - Whether the search should use wildcards
-        * @psalm-param array{escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
+        * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
         * @return array an array of contacts which are arrays of key-value-pairs
         */
        public function search($addressBookId, $pattern, $searchProperties, $options = []): array {

diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php
index 0110990a408b6865f895608e662244b123dd0ffd..3bc3ba33173a0df07e3653f51b0c27e84f614fd9 100644 (file)
--- a/apps/dav/lib/DAV/CustomPropertiesBackend.php
+++ b/apps/dav/lib/DAV/CustomPropertiesBackend.php
@@ -98,7 +98,7 @@ class CustomPropertiesBackend implements BackendInterface {
        /**
         * Properties set by one user, readable by all others
         *
-        * @var array[]
+        * @var string[]
         */
        private const PUBLISHED_READ_ONLY_PROPERTIES = [
                '{urn:ietf:params:xml:ns:caldav}calendar-availability',

diff --git a/apps/dav/lib/Events/CalendarShareUpdatedEvent.php b/apps/dav/lib/Events/CalendarShareUpdatedEvent.php
index d5a568d149bf6576abce992308da98dffde7403a..dedd9f8a5663bb8d4e1bceac448adbf786491ee5 100644 (file)
--- a/apps/dav/lib/Events/CalendarShareUpdatedEvent.php
+++ b/apps/dav/lib/Events/CalendarShareUpdatedEvent.php
@@ -38,7 +38,7 @@ use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet;
 class CalendarShareUpdatedEvent extends Event {
        private int $calendarId;
 
-       /** @var array{id: int, uri: string, '{http://calendarserver.org/ns/}getctag': string, '{http://sabredav.org/ns}sync-token': int, '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set': SupportedCalendarComponentSet, '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp': ScheduleCalendarTransp } */
+       /** @var array{id: int, uri: string, '{http://calendarserver.org/ns/}getctag': string, '{http://sabredav.org/ns}sync-token': int, '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set': SupportedCalendarComponentSet, '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp': ScheduleCalendarTransp, '{urn:ietf:params:xml:ns:caldav}calendar-timezone': ?string } */
        private array $calendarData;
 
        /** @var list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}> */
@@ -54,7 +54,7 @@ class CalendarShareUpdatedEvent extends Event {
         * CalendarShareUpdatedEvent constructor.
         *
         * @param int $calendarId
-        * @param array{id: int, uri: string, '{http://calendarserver.org/ns/}getctag': string, '{http://sabredav.org/ns}sync-token': int, '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set': SupportedCalendarComponentSet, '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp': ScheduleCalendarTransp } $calendarData
+        * @param array{id: int, uri: string, '{http://calendarserver.org/ns/}getctag': string, '{http://sabredav.org/ns}sync-token': int, '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set': SupportedCalendarComponentSet, '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp': ScheduleCalendarTransp, '{urn:ietf:params:xml:ns:caldav}calendar-timezone': ?string } $calendarData
         * @param list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}> $oldShares
         * @param list<array{href: string, commonName: string, readOnly: bool}> $added
         * @param list<string> $removed
@@ -81,7 +81,7 @@ class CalendarShareUpdatedEvent extends Event {
        }
 
        /**
-        * @return array{id: int, uri: string, '{http://calendarserver.org/ns/}getctag': string, '{http://sabredav.org/ns}sync-token': int, '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set': SupportedCalendarComponentSet, '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp': ScheduleCalendarTransp }
+        * @return array{id: int, uri: string, '{http://calendarserver.org/ns/}getctag': string, '{http://sabredav.org/ns}sync-token': int, '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set': SupportedCalendarComponentSet, '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp': ScheduleCalendarTransp, '{urn:ietf:params:xml:ns:caldav}calendar-timezone': ?string }
         * @since 20.0.0
         */
        public function getCalendarData(): array {