Skip to content

fix(IUserManager): Fix deprecation of search method #55461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2025
Merged

fix(IUserManager): Fix deprecation of search method #55461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 57 additions & 6 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -2768,6 +2779,9 @@
</UndefinedInterfaceMethod>
</file>
<file src="core/Command/Preview/ResetRenderedTexts.php">
<DeprecatedMethod>
<code><![CDATA[search]]></code>
</DeprecatedMethod>
<InvalidReturnStatement>
<code><![CDATA[[]]]></code>
</InvalidReturnStatement>
Expand All @@ -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>
Expand Down Expand Up @@ -2824,17 +2843,49 @@
<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>
<code><![CDATA[\OC_Util::tearDownFS()]]></code>
</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>
Expand Down
9 changes: 0 additions & 9 deletions lib/private/User/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions lib/public/IUserManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Loading