From 8e7695759e1dd6bd86a0862a2aa6fb2e20e04110 Mon Sep 17 00:00:00 2001
From: Anna Larch <anna@nextcloud.com>
Date: Wed, 11 Dec 2024 14:25:48 +0100
Subject: [PATCH] fixup! fixup! fix(conversations): fix password enforcement
 logic error

---
 lib/Manager.php                       | 1 +
 tests/php/Service/RoomServiceTest.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Manager.php b/lib/Manager.php
index a4e87a89efb..c25ac9080f2 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -1107,6 +1107,7 @@ public function getChangelogRoom(string $userId): Room {
 	 * @param string $name
 	 * @param string $objectType
 	 * @param string $objectId
+	 * @param string $password
 	 * @return Room
 	 */
 	public function createRoom(int $type, string $name = '', string $objectType = '', string $objectId = '', string $password = ''): Room {
diff --git a/tests/php/Service/RoomServiceTest.php b/tests/php/Service/RoomServiceTest.php
index 123f243637c..691d3875bcc 100644
--- a/tests/php/Service/RoomServiceTest.php
+++ b/tests/php/Service/RoomServiceTest.php
@@ -285,7 +285,7 @@ public function testCreateConversation(int $type, string $name, string $ownerId,
 			->with($type, $name, $objectType, $objectId, $password)
 			->willReturn($room);
 
-		$this->assertSame($room, $this->service->createConversation($type, $name, $owner, $objectType, $objectId));
+		$this->assertSame($room, $this->service->createConversation($type, $name, $owner, $objectType, $objectId, $password));
 	}
 
 	public static function dataPrepareConversationName(): array {