diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 92479b887aac3..839861094f0c3 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -701,6 +701,9 @@
     </NullableReturnStatement>
   </file>
   <file src="apps/dav/lib/Connector/Sabre/Principal.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
     <InvalidNullableReturnType>
       <code><![CDATA[array]]></code>
     </InvalidNullableReturnType>
@@ -714,8 +717,7 @@
       <code><![CDATA[$results]]></code>
     </InvalidScalarArgument>
     <NullableReturnStatement>
-      <code><![CDATA[null]]></code>
-      <code><![CDATA[null]]></code>
+      <code><![CDATA[$this->getPrincipalPropertiesByPath($path)]]></code>
       <code><![CDATA[null]]></code>
       <code><![CDATA[null]]></code>
       <code><![CDATA[null]]></code>
@@ -1282,6 +1284,7 @@
       <code><![CDATA[listen]]></code>
       <code><![CDATA[listen]]></code>
       <code><![CDATA[listen]]></code>
+      <code><![CDATA[search]]></code>
     </DeprecatedMethod>
   </file>
   <file src="apps/files/lib/Command/ScanAppData.php">
@@ -1499,9 +1502,6 @@
       <code><![CDATA[Files::buildNotExistingFileName('/', $name)]]></code>
       <code><![CDATA[execute]]></code>
       <code><![CDATA[execute]]></code>
-      <code><![CDATA[execute]]></code>
-      <code><![CDATA[execute]]></code>
-      <code><![CDATA[execute]]></code>
       <code><![CDATA[insertIfNotExist]]></code>
       <code><![CDATA[sendNotification]]></code>
       <code><![CDATA[sendNotification]]></code>
@@ -1843,6 +1843,8 @@
       <code><![CDATA[implementsActions]]></code>
       <code><![CDATA[implementsActions]]></code>
       <code><![CDATA[implementsActions]]></code>
+      <code><![CDATA[search]]></code>
+      <code><![CDATA[search]]></code>
     </DeprecatedMethod>
     <TypeDoesNotContainNull>
       <code><![CDATA[$groupid === null]]></code>
@@ -2254,7 +2256,6 @@
       <code><![CDATA[getAppValue]]></code>
       <code><![CDATA[setAppValue]]></code>
       <code><![CDATA[setAppValue]]></code>
-      <code><![CDATA[setAppValue]]></code>
     </DeprecatedMethod>
   </file>
   <file src="apps/theming/lib/Util.php">
@@ -2621,6 +2622,11 @@
       <code><![CDATA[setAppValue]]></code>
     </DeprecatedMethod>
   </file>
+  <file src="core/BackgroundJobs/GenerateMetadataJob.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
   <file src="core/Command/App/ListApps.php">
     <LessSpecificImplementedReturnType>
       <code><![CDATA[array]]></code>
@@ -2743,6 +2749,11 @@
       <code><![CDATA[\OC_Util::tearDownFS()]]></code>
     </DeprecatedMethod>
   </file>
+  <file src="core/Command/Group/AddUser.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
   <file src="core/Command/Log/File.php">
     <InvalidReturnStatement>
       <code><![CDATA[[0]]]></code>
@@ -2768,6 +2779,9 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="core/Command/Preview/ResetRenderedTexts.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
     <InvalidReturnStatement>
       <code><![CDATA[[]]]></code>
     </InvalidReturnStatement>
@@ -2783,6 +2797,11 @@
       <code><![CDATA[resetDelayForIP]]></code>
     </DeprecatedMethod>
   </file>
+  <file src="core/Command/TwoFactorAuth/Base.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
   <file src="core/Command/Upgrade.php">
     <DeprecatedMethod>
       <code><![CDATA[listen]]></code>
@@ -2824,6 +2843,21 @@
       <code><![CDATA[IToken]]></code>
     </DeprecatedInterface>
   </file>
+  <file src="core/Command/User/Delete.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
+  <file src="core/Command/User/Disable.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
+  <file src="core/Command/User/Enable.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
   <file src="core/Command/User/Info.php">
     <DeprecatedClass>
       <code><![CDATA[\OC_Util::setupFS($user->getUID())]]></code>
@@ -2831,10 +2865,27 @@
     </DeprecatedClass>
     <DeprecatedMethod>
       <code><![CDATA[\OC_Util::tearDownFS()]]></code>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
+  <file src="core/Command/User/LastSeen.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
+  <file src="core/Command/User/Profile.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
+    </DeprecatedMethod>
+  </file>
+  <file src="core/Command/User/ResetPassword.php">
+    <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
     </DeprecatedMethod>
   </file>
   <file src="core/Command/User/Setting.php">
     <DeprecatedMethod>
+      <code><![CDATA[search]]></code>
       <code><![CDATA[setEMailAddress]]></code>
     </DeprecatedMethod>
   </file>
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 028ee87b40bb3..765e8fa3d7b7f 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -252,15 +252,6 @@ public function checkPasswordNoLogging($loginName, $password) {
 		return false;
 	}
 
-	/**
-	 * Search by user id
-	 *
-	 * @param string $pattern
-	 * @param int $limit
-	 * @param int $offset
-	 * @return IUser[]
-	 * @deprecated 27.0.0, use searchDisplayName instead
-	 */
 	public function search($pattern, $limit = null, $offset = null) {
 		$users = [];
 		foreach ($this->backends as $backend) {
diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php
index a4b70327e1e63..973e1c5ef4077 100644
--- a/lib/public/IUserManager.php
+++ b/lib/public/IUserManager.php
@@ -104,6 +104,7 @@ public function checkPassword($loginName, $password);
 	 * @param int $offset
 	 * @return \OCP\IUser[]
 	 * @since 8.0.0
+	 * @deprecated 27.0.0, use searchDisplayName instead
 	 */
 	public function search($pattern, $limit = null, $offset = null);