Merge pull request #1457 from tcitworld/allow-sync-get-changes-to-ret…

…urn-null fix(sync): Fix PHPDoc to allow getChanges for sync to return null
sabre-io · Mar 22, 2023 · 8e09bff · 8e09bff
2 parents 2d8f6d9 + 9b10ec6
commit 8e09bff
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/lib/CalDAV/Backend/PDO.php b/lib/CalDAV/Backend/PDO.php
@@ -939,7 +939,7 @@ public function getCalendarObjectByUID($principalUri, $uid)
      * @param int    $syncLevel
      * @param int    $limit
      *
-     * @return array
+     * @return array|null
      */
     public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null)
     {

diff --git a/lib/CalDAV/Backend/SyncSupport.php b/lib/CalDAV/Backend/SyncSupport.php
@@ -77,7 +77,7 @@ interface SyncSupport extends BackendInterface
      * @param int    $syncLevel
      * @param int    $limit
      *
-     * @return array
+     * @return array|null
      */
     public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null);
 }
diff --git a/lib/CalDAV/Calendar.php b/lib/CalDAV/Calendar.php
@@ -442,7 +442,7 @@ public function getSyncToken()
      * @param int    $syncLevel
      * @param int    $limit
      *
-     * @return array
+     * @return array|null
      */
     public function getChanges($syncToken, $syncLevel, $limit = null)
     {

diff --git a/lib/CardDAV/AddressBook.php b/lib/CardDAV/AddressBook.php
@@ -317,7 +317,7 @@ public function getSyncToken()
      * @param int    $syncLevel
      * @param int    $limit
      *
-     * @return array
+     * @return array|null
      */
     public function getChanges($syncToken, $syncLevel, $limit = null)
     {

diff --git a/lib/CardDAV/Backend/PDO.php b/lib/CardDAV/Backend/PDO.php
@@ -452,7 +452,7 @@ public function deleteCard($addressBookId, $cardUri)
      * @param int    $syncLevel
      * @param int    $limit
      *
-     * @return array
+     * @return array|null
      */
     public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null)
     {

diff --git a/lib/CardDAV/Backend/SyncSupport.php b/lib/CardDAV/Backend/SyncSupport.php
@@ -77,7 +77,7 @@ interface SyncSupport extends BackendInterface
      * @param int    $syncLevel
      * @param int    $limit
      *
-     * @return array
+     * @return array|null
      */
     public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null);
 }
diff --git a/lib/DAV/Sync/ISyncCollection.php b/lib/DAV/Sync/ISyncCollection.php
@@ -84,7 +84,7 @@ public function getSyncToken();
      * @param int    $syncLevel
      * @param int    $limit
      *
-     * @return array
+     * @return array|null
      */
     public function getChanges($syncToken, $syncLevel, $limit = null);
 }
diff --git a/tests/Sabre/DAV/Sync/MockSyncCollection.php b/tests/Sabre/DAV/Sync/MockSyncCollection.php
@@ -98,7 +98,7 @@ public function addChange(array $added, array $modified, array $deleted)
      * @param int    $syncLevel
      * @param int    $limit
      *
-     * @return array
+     * @return array|null
      */
     public function getChanges($syncToken, $syncLevel, $limit = null)
     {