From ddfb903549a5107bf7c7f249fcf27ce656dc7f32 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 15 May 2026 12:15:12 +0200
Subject: [PATCH 1/2] chore(CI): Adjust testing matrix for Nextcloud 34 on
 stable34

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 composer.json |  2 +-
 composer.lock | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 9b6219b9..139e0234 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "nextcloud/ldap_write_support",
     "type": "project",
     "require-dev": {
-        "nextcloud/ocp": "dev-master",
+        "nextcloud/ocp": "dev-stable34",
         "bamarni/composer-bin-plugin": "^1.8"
     },
     "scripts": {
diff --git a/composer.lock b/composer.lock
index 2caf3549..f9aa60e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "428394bf88f813c392510e0395b2cc67",
+    "content-hash": "74dc0bc13a07909bebdc0c867ffcfbe6",
     "packages": [],
     "packages-dev": [
         {
@@ -66,16 +66,16 @@
         },
         {
             "name": "nextcloud/ocp",
-            "version": "dev-master",
+            "version": "dev-stable34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "f3fddf2af92f48d3f53569074f69f0ae4bad52b6"
+                "reference": "72de02fbad95545055983d050e564fe39128992d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f3fddf2af92f48d3f53569074f69f0ae4bad52b6",
-                "reference": "f3fddf2af92f48d3f53569074f69f0ae4bad52b6",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/72de02fbad95545055983d050e564fe39128992d",
+                "reference": "72de02fbad95545055983d050e564fe39128992d",
                 "shasum": ""
             },
             "require": {
@@ -86,11 +86,10 @@
                 "psr/http-client": "^1.0.3",
                 "psr/log": "^3.0.2"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "34.0.0-dev"
+                    "dev-stable34": "34.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -110,9 +109,9 @@
             "description": "Composer package containing Nextcloud's public OCP API and the unstable NCU API",
             "support": {
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
-                "source": "https://github.com/nextcloud-deps/ocp/tree/master"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable34"
             },
-            "time": "2026-05-09T01:52:54+00:00"
+            "time": "2026-05-15T08:43:27+00:00"
         },
         {
             "name": "psr/clock",

From dbcac3513519a9b2c554b9b585c15e7d1d88f2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Thu, 9 Jul 2026 13:39:35 +0200
Subject: [PATCH 2/2] fix: Remove useless check on connection object
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 lib/LDAPUserManager.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/LDAPUserManager.php b/lib/LDAPUserManager.php
index d81d0047..202f80f9 100644
--- a/lib/LDAPUserManager.php
+++ b/lib/LDAPUserManager.php
@@ -84,10 +84,6 @@ public function setDisplayName($uid, $displayName) {
 			);
 		}
 
-		if (!is_resource($connection) && !is_object($connection)) {
-			$this->logger->debug('LDAP resource not available', ['app' => 'ldap_write_support']);
-			throw new ServerNotAvailableException('LDAP server is not available');
-		}
 		try {
 			if (ldap_mod_replace($connection, $userDN, [$displayNameField => $displayName])) {
 				return $displayName;