Skip to content

[stable22] Avoid PHP errors when the LDAP attribute is not found #29316

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

Merged
skjnldsv merged 4 commits into from
Oct 22, 2021
Merged

[stable22] Avoid PHP errors when the LDAP attribute is not found #29316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
206d6d0
Avoid PHP errors when the LDAP attribute is not found
come-nc Oct 12, 2021
d29a132
Use Psr\Log\LoggerInterface in OCA\User_LDAP\Access
come-nc Oct 12, 2021
6372c34
Fix two mistakes in previous migration to LoggerInterface in OCA\User…
come-nc Oct 14, 2021
9f27bde
Use Psr\Log\LoggerInterface where it can easily be used in user_ldap
come-nc Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix two mistakes in previous migration to LoggerInterface in OCA\User… 
…_LDAP\Access

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Oct 19, 2021
commit 6372c34c400586c0ccfb412e961603414a7592e7
3 changes: 2 additions & 1 deletion apps/user_ldap/ajax/wizard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
$userManager,
new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
\OC::$server->getConfig(),
\OC::$server->getUserManager()
\OC::$server->getUserManager(),
\OC::$server->get(\Psr\Log\LoggerInterface::class)
);

$wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access);
Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/lib/Jobs/Sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public function setArgument($argument) {
if (isset($argument['logger'])) {
$this->logger = $argument['logger'];
} else {
$this->logger = \OC::$server->getLogger();
$this->logger = \OC::$server->get(LoggerInterface::class);
}

if (isset($argument['notificationManager'])) {
Expand Down