diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-03-12 11:20:04 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-05-31 07:49:19 +0200 |
| commit | d6d8e9215c69a9e8d4bfa2035c657b0a037f3a2f (patch) | |
| tree | 942254503672d6ab3e0b6c8fca0bd4053db352b9 /build | |
| parent | 9e596dd0cf455dc1639141c695f89c7d936f4c0c (diff) | |
| download | nextcloud-server-d6d8e9215c69a9e8d4bfa2035c657b0a037f3a2f.tar.gz nextcloud-server-d6d8e9215c69a9e8d4bfa2035c657b0a037f3a2f.zip | |
Add a trashbin for calendars and calendar objects
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'build')
| -rw-r--r-- | build/integration/features/bootstrap/CalDavContext.php | 3 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 26 |
2 files changed, 16 insertions, 13 deletions
diff --git a/build/integration/features/bootstrap/CalDavContext.php b/build/integration/features/bootstrap/CalDavContext.php index b1981568e44..e01621359f1 100644 --- a/build/integration/features/bootstrap/CalDavContext.php +++ b/build/integration/features/bootstrap/CalDavContext.php @@ -70,6 +70,9 @@ class CalDavContext implements \Behat\Behat\Context\Context { 'admin', 'admin', ], + 'headers' => [ + 'X-NC-CalDAV-No-Trashbin' => '1', + ] ] ); } catch (\GuzzleHttp\Exception\ClientException $e) { diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 225d191f640..5971cc18c35 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -163,11 +163,14 @@ <file src="apps/dav/lib/CalDAV/CalDavBackend.php"> <InvalidArgument occurrences="8"> <code>'\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject'</code> + <code>'\OCA\DAV\CalDAV\CalDavBackend::createSubscription'</code> <code>'\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject'</code> + <code>'\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription'</code> <code>'\OCA\DAV\CalDAV\CalDavBackend::publishCalendar'</code> <code>'\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject'</code> + <code>'\OCA\DAV\CalDAV\CalDavBackend::updateShares'</code> <code>'\OCA\DAV\CalDAV\CalDavBackend::updateSubscription'</code> </InvalidArgument> @@ -186,7 +189,7 @@ <RedundantCast occurrences="1"> <code>(int)$calendarId</code> </RedundantCast> - <TooManyArguments occurrences="9"> + <TooManyArguments occurrences="13"> <code>dispatch</code> <code>dispatch</code> <code>dispatch</code> @@ -200,7 +203,7 @@ <code>dispatch</code> <code>dispatch</code> <code>dispatch</code> - <code>purgeProperties</code> + </TooManyArguments> <UndefinedFunction occurrences="4"> <code>Uri\split($principalUri)</code> @@ -210,16 +213,13 @@ </UndefinedFunction> </file> <file src="apps/dav/lib/CalDAV/CalendarHome.php"> - <InvalidReturnStatement occurrences="5"> - <code>$calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri)</code> - <code>new Inbox($this->caldavBackend, $this->principalInfo['uri'])</code> - <code>new Outbox($this->config, $this->principalInfo['uri'])</code> - <code>new Subscription($this->caldavBackend, $subscription)</code> - <code>new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri'])</code> - </InvalidReturnStatement> - <InvalidReturnType occurrences="1"> - <code>getChild</code> - </InvalidReturnType> + <InvalidNullableReturnType occurrences="1"> + <code>INode</code> + </InvalidNullableReturnType> + <LessSpecificImplementedReturnType occurrences="1"> + <code>INode</code> + </LessSpecificImplementedReturnType> + <NullableReturnStatement occurrences="1"> <code>$calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri)</code> </NullableReturnStatement> @@ -5095,4 +5095,4 @@ <code>$e->getCode()</code> </InvalidScalarArgument> </file> -</files> +</files>
\ No newline at end of file |