diff options
| author | Julius Härtl <jus@bitgrid.net> | 2022-02-15 10:27:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-15 10:27:43 +0300 |
| commit | 43ac9c10f55566fadcda600363d74f95c567f9df (patch) | |
| tree | cf169000c83c42b762aded83bca7f197459d4ef5 | |
| parent | ba7a31d73b34c622ed74e6aed8c1695327c2d574 (diff) | |
| parent | f695b3af9abc4f4af9afb96c776265071e20fa06 (diff) | |
Merge pull request #31176 from nextcloud/remove-obsolete-dav-defaultUsernamePath
Remove setting defaultUsernamePath dynamically
| -rw-r--r-- | apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/Server.php | 1 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 8 |
3 files changed, 0 insertions, 10 deletions
diff --git a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php index af3d7c1269a..5317dc1b169 100644 --- a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php +++ b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php @@ -84,7 +84,6 @@ class InvitationResponseServer { $acl->principalCollectionSet = [ 'principals/users', 'principals/groups' ]; - $acl->defaultUsernamePath = 'principals/users'; $this->server->addPlugin($acl); // calendar plugins diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 6ab591fcf6d..ef7aa73dfb5 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -155,7 +155,6 @@ class Server { 'principals/calendar-resources', 'principals/calendar-rooms', ]; - $acl->defaultUsernamePath = 'principals/users'; $this->server->addPlugin($acl); // calendar plugins diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index d5092282088..6c58df3858d 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -243,11 +243,6 @@ <code>$principal</code> </ParamNameMismatch> </file> - <file src="apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php"> - <UndefinedPropertyAssignment occurrences="1"> - <code>$acl->defaultUsernamePath</code> - </UndefinedPropertyAssignment> - </file> <file src="apps/dav/lib/CalDAV/Plugin.php"> <ImplementedReturnTypeMismatch occurrences="1"> <code>string|null</code> @@ -939,9 +934,6 @@ <code>dispatch</code> <code>dispatch</code> </TooManyArguments> - <UndefinedPropertyAssignment occurrences="1"> - <code>$acl->defaultUsernamePath</code> - </UndefinedPropertyAssignment> </file> <file src="apps/dav/lib/SystemTag/SystemTagsByIdCollection.php"> <InvalidNullableReturnType occurrences="1"> |