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.

Sign up for GitHub

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

Jump to bottom

[stable27] display displayname on federated shares #39269

Merged
merged 1 commit into from Jul 11, 2023
Merged

[stable27] display displayname on federated shares #39269

merged 1 commit into from Jul 11, 2023

Conversation

ArtificialOwl
Copy link
Member

@ArtificialOwl ArtificialOwl commented Jul 10, 2023 •
edited

backport of #35915

github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 10, 2023
View reviewed changes
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
@@ -335,13 +341,13 @@
return $result;
}

private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {

Check notice

Code scanning / Psalm

MissingParamType Note

Parameter $shareWith has no provided type
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
@@ -335,13 +341,13 @@
return $result;
}

private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {

Check notice

Code scanning / Psalm

MissingParamType Note

Parameter $shareId has no provided type
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
@@ -335,13 +341,13 @@
return $result;
}

private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {

Check notice

Code scanning / Psalm

MissingParamType Note

Parameter $ownerFederatedId has no provided type
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
@@ -335,13 +341,13 @@
return $result;
}

private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {

Check notice

Code scanning / Psalm

MissingParamType Note

Parameter $sharedByFederatedId has no provided type
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
@@ -335,13 +341,13 @@
return $result;
}

private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {

Check notice

Code scanning / Psalm

MissingParamType Note

Parameter $name has no provided type
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
@@ -335,13 +341,13 @@
return $result;
}

private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {

Check notice

Code scanning / Psalm

MissingParamType Note

Parameter $displayName has no provided type
apps/files_sharing/lib/Controller/ShareAPIController.php
'strict_search' => true,
]);
try {
$result = \OC::$server->getContactsManager()->search($query, [$property], [

Check notice

Code scanning / Psalm

DeprecatedMethod Note

The method OC\Server::getContactsManager has been marked as deprecated
@ArtificialOwl
display displayname on federated shares
3b93a35 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
@blizzz blizzz added this to the Nextcloud 27.0.1 milestone Jul 11, 2023
@blizzz blizzz added 3. to review Waiting for reviews 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 11, 2023
@blizzz
Copy link
Member

blizzz commented Jul 11, 2023

milestone and labels were missing

@blizzz blizzz merged commit 7fd10d5 into stable27 Jul 11, 2023
36 checks passed
@blizzz blizzz deleted the backport/35915/35915-stable27 branch July 11, 2023 15:57
@blizzz blizzz mentioned this pull request Jul 11, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Altahrim Altahrim Altahrim approved these changes

@artonge artonge artonge approved these changes

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Milestone
Nextcloud 27.0.1
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ArtificialOwl @blizzz @Altahrim @artonge