Fix some ldap related issues#30201
Closed
CarlSchwan wants to merge 3 commits intoldap_group_nestedfrom
Closed
Conversation
CarlSchwan
force-pushed
the
fix/ldap_issues
branch
5 times, most recently
from
c8d90ec to
b7d1a52
Compare
come-nc
reviewed
Dec 13, 2021
Contributor
|
Apart from the docblock remark, everything in there seems to improve the situation. |
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Currently the check if an object is in intermediates is done using
group-{gid} for groups but only user- for users. This change the check
for user to user-{uid}.
This fix the listing of users in a group in the users settings.
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
This fixes some cases observed with the debugger where we end up merging a non empty list with null. The result is then null and the looping over the items would then end. Signed-off-by: Carl Schwan <carl@carlschwan.eu>
CarlSchwan
force-pushed
the
fix/ldap_issues
branch
from
b7d1a52 to
68fbe7b
Compare
come-nc
approved these changes
Dec 13, 2021
Contributor
|
(Lots of psalm error through, please look into them as you added typing they may unravel real problems) |
Member
Author
|
The psaml errors are unfortunately normal in stable20 and earlier. There are none in the master equivalent of this: #30223 |
| * @throws Exception | ||
| */ | ||
| private function getNameOfGroup(string $filter, string $cacheKey) { | ||
| private function getNameOfGroup(string $filter, string $cacheKey): ?string { |
Member
There was a problem hiding this comment.
apps/user_ldap/lib/Group_LDAP.php#L472
The declared return type 'null|string' for OCA\User_LDAP\Group_LDAP::getNameOfGroup does not allow false, but the function returns 'false|string'
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
3 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.
This included three commits, see individual commit message for more in-depth explaination