[stable30] fix(cardav): only show users from enabled addressBooks in contacts menu#51538
Merged
ChristophWurst merged 1 commit intostable30from Mar 26, 2025
Merged
[stable30] fix(cardav): only show users from enabled addressBooks in contacts menu#51538ChristophWurst merged 1 commit intostable30from
ChristophWurst merged 1 commit intostable30from
Conversation
backportbot
bot
added
bug
3. to review
hamza221
force-pushed
the
backport/51380/stable30
branch
2 times, most recently
from
58303c5 to
031cf2f
Compare
hamza221
approved these changes
Mar 21, 2025
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
|
||
| private function setupSystemContactsProvider(IContactsManager $contactsManager, | ||
| IAppContainer $container): void { | ||
| private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void { |
Check notice
Code scanning / Psalm
DeprecatedInterface Note
| } | ||
|
|
||
| $path = 'addressbooks/users/' . $user . '/' . $uri; | ||
| $properties = $this->propertyMapper->findPropertyByPathAndName($user, $path, '{http://owncloud.org/ns}enabled'); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| * @param IURLGenerator $urlGenerator | ||
| */ | ||
| public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) { | ||
| public function setupSystemContactsProvider(IManager $cm, ?string $userId, IURLGenerator $urlGenerator) { |
Check notice
Code scanning / Psalm
MissingReturnType Note
| * @param ?string $userId | ||
| */ | ||
| private function register(IManager $cm, $addressBooks, $urlGenerator) { | ||
| private function register(IManager $cm, $addressBooks, $urlGenerator, ?string $userId) { |
Check notice
Code scanning / Psalm
MissingReturnType Note
| * @param ?string $userId | ||
| */ | ||
| private function register(IManager $cm, $addressBooks, $urlGenerator) { | ||
| private function register(IManager $cm, $addressBooks, $urlGenerator, ?string $userId) { |
Check notice
Code scanning / Psalm
MissingParamType Note
Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
hamza221
force-pushed
the
backport/51380/stable30
branch
from
031cf2f to
e55a375
Compare
| } | ||
|
|
||
| public function isEnabled(): bool { | ||
| if (!$this->userId) { |
Check notice
Code scanning / Psalm
RiskyTruthyFalsyComparison Note
| $uri = $this->addressBookInfo['uri']; | ||
| } | ||
|
|
||
| $path = 'addressbooks/users/' . $user . '/' . $uri; |
Check notice
Code scanning / Psalm
PossiblyInvalidOperand Note
AndyScherzinger
approved these changes
Mar 21, 2025
st3iny
approved these changes
Mar 21, 2025
Contributor
|
Cypress looks unrelated |
skjnldsv
removed
the
pending documentation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #51380
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.