Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sync): Fix PHPDoc to allow getChanges for sync to return null #1457

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/CalDAV/Backend/PDO.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/CalDAV/Backend/SyncSupport.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion lib/CalDAV/Calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/CardDAV/AddressBook.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/CardDAV/Backend/PDO.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/CardDAV/Backend/SyncSupport.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion lib/DAV/Sync/ISyncCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion tests/Sabre/DAV/Sync/MockSyncCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down