1 files changed, 28 insertions, 8 deletions
diff --git a/tests/lib/Traits/UserTrait.php b/tests/lib/Traits/UserTrait.php
index 229087a5200..f80adb76be8 100644
--- a/tests/lib/Traits/UserTrait.php
+++ b/tests/lib/Traits/UserTrait.php
@@ -1,32 +1,52 @@
 <?php
+
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test\Traits;
 
+use OC\User\User;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\Server;
+use OCP\UserInterface;
+
+class DummyUser extends User {
+	public function __construct(
+		private string $uid,
+	) {
+		parent::__construct($this->uid, null, Server::get(IEventDispatcher::class));
+	}
+
+	public function getUID(): string {
+		return $this->uid;
+	}
+}
+
 /**
  * Allow creating users in a temporary backend
  */
 trait UserTrait {
 	/**
-	 * @var \Test\Util\User\Dummy|\OCP\UserInterface
+	 * @var \Test\Util\User\Dummy|UserInterface
 	 */
 	protected $userBackend;
 
-	protected function createUser($name, $password) {
+	protected function createUser($name, $password): IUser {
 		$this->userBackend->createUser($name, $password);
+		return new DummyUser($name);
 	}
 
 	protected function setUpUserTrait() {
 		$this->userBackend = new \Test\Util\User\Dummy();
-		\OC::$server->getUserManager()->registerBackend($this->userBackend);
+		Server::get(IUserManager::class)->registerBackend($this->userBackend);
 	}
 
 	protected function tearDownUserTrait() {
-		\OC::$server->getUserManager()->removeBackend($this->userBackend);
+		Server::get(IUserManager::class)->removeBackend($this->userBackend);
 	}
 }