upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

fix(IUserManager): Fix deprecation of search method

Browse source 
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
provokateurin 2025-10-01 12:05:32 +02:00
parent d36fc65c75
commit fb4348e3bc
No known key found for this signature in database
3 changed files with 58 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
build/psalm-baseline.xml
View file

@ -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>

9
lib/private/User/Manager.php
View file

@ -252,15 +252,6 @@ class Manager extends PublicEmitter implements IUserManager {
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) {

1
lib/public/IUserManager.php
View file

@ -104,6 +104,7 @@ interface IUserManager {
* @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);