Skip to content

Commit 0cffaa2

Browse files
committed
chore: Update nextcloud/ocp, update baseline, remove dead code
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
1 parent 0d2fb70 commit 0cffaa2

3 files changed

Lines changed: 6 additions & 17 deletions

File tree

composer.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/LDAPUserManager.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ public function setDisplayName($uid, $displayName): string {
8585
);
8686
}
8787

88-
if (!is_object($connection)) {
89-
$this->logger->debug('LDAP resource not available', ['app' => 'ldap_write_support']);
90-
throw new ServerNotAvailableException('LDAP server is not available');
91-
}
9288
try {
9389
if (ldap_mod_replace($connection, $userDN, [$displayNameField => $displayName])) {
9490
return $displayName;

tests/psalm-baseline.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
- SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
4-
- SPDX-License-Identifier: AGPL-3.0-or-later
5-
-->
6-
<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
2+
<files psalm-version="6.16.1@f1f5de594dc76faf8784e02d3dc4716c91c6f6ac">
73
<file src="lib/LDAPConnect.php">
84
<RedundantCast>
95
<code><![CDATA[(string)$this->ldapConfig->ldapGroupFilter]]></code>
106
<code><![CDATA[(string)$this->ldapConfig->ldapGroupMemberAssocAttr]]></code>
117
</RedundantCast>
12-
<RedundantCondition>
13-
<code>!is_resource($cr)</code>
14-
</RedundantCondition>
158
</file>
169
<file src="lib/LDAPUserManager.php">
1710
<UndefinedInterfaceMethod>
18-
<code>listen</code>
11+
<code><![CDATA[listen]]></code>
1912
</UndefinedInterfaceMethod>
2013
</file>
2114
</files>

0 commit comments

Comments
 (0)