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

[stable20] Avoid PHP errors when the LDAP attribute is not found #29314

Merged
merged 5 commits into from
Nov 4, 2021
Merged

[stable20] Avoid PHP errors when the LDAP attribute is not found #29314

merged 5 commits into from
Nov 4, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Oct 19, 2021 •
edited by skjnldsv
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #29180

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 20.0.14 milestone Oct 19, 2021
@come-nc come-nc force-pushed the backport/29180/stable20 branch 3 times, most recently from 2f60be5 to eae373f Compare October 28, 2021 10:41
@come-nc come-nc self-assigned this Oct 28, 2021
@come-nc
Copy link
Contributor

come-nc commented Oct 28, 2021

I think none of the remaining failures are related to the PR

@come-nc come-nc added 3. to review Waiting for reviews feature: ldap labels Oct 28, 2021
@blizzz
Copy link
Member

blizzz commented Oct 29, 2021

/rebase

blizzz
blizzz approved these changes Oct 29, 2021
View reviewed changes
Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please adapt the PR description

@come-nc @blizzz
Avoid PHP errors when the LDAP attribute is not found
355bf52 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc @blizzz
Use Psr\Log\LoggerInterface in OCA\User_LDAP\Access
3f8ea18 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc @blizzz
Fix two mistakes in previous migration to LoggerInterface in OCA\User…
63f29ca 
…_LDAP\Access

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc @blizzz
Use Psr\Log\LoggerInterface where it can easily be used in user_ldap
07c9dc0 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc @blizzz
Fix Access constructor call
349f4f6 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@blizzz blizzz mentioned this pull request Nov 3, 2021
Merged
15 tasks
@skjnldsv skjnldsv merged commit b06e32a into stable20 Nov 4, 2021
@skjnldsv skjnldsv deleted the backport/29180/stable20 branch November 4, 2021 08:19
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CarlSchwan CarlSchwan CarlSchwan left review comments

@come-nc come-nc come-nc approved these changes

@blizzz blizzz blizzz approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees

@come-nc come-nc

Labels
4. to release Ready to be released and/or waiting for tests to finish feature: ldap
Projects
None yet
Milestone
Nextcloud 20.0.14
Development

Successfully merging this pull request may close these issues.
4 participants
@come-nc @blizzz @CarlSchwan @skjnldsv