Uses IShare::TYPE_... in Server.php rather than the obsolete Constants

[StCyr]

It doesn't look like those search plugins are used somewhere else....

hmmm.... Here might be another attention point though:

server/lib/private/legacy/OC_App.php

Line 257 in 5a12e8f

\OC::$server->getCollaboratorSearch()->registerPlugin($pluginInfo);

Signed-off-by: Cyrille Bollu [email protected]

[nickvergessen]

Here might be another attention point though:

Any app can register a provider:
https://github.com/nextcloud/spreed/blob/master/appinfo/info.xml#L129

[CarlSchwan]

Here might be another attention point though:

Any app can register a provider: https://github.com/nextcloud/spreed/blob/master/appinfo/info.xml#L129

Yeah so would be good to double check if external apps like talk and circle still work

[StCyr]

Here might be another attention point though:

Any app can register a provider: https://github.com/nextcloud/spreed/blob/master/appinfo/info.xml#L129

Yeah so would be good to double check if external apps like talk and circle still work

Indeed.

IIUC, plugins registered via an app are processed via server/lib/private/legacy/OC_App.php and this won't work anymore with my change.

Should I just add a test in lib/private/Collaboration/Collaborators/Search.php?

	public function registerPlugin(array $pluginInfo) {
---		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
+++	if (str_starts_with($pluginInfo['shareType'], 'SHARE_TYPE') {
+++              $shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
+++	else {
+++              $shareType = $pluginInfo['shareType'];
+++         }
		if ($shareType === null) {
			throw new \InvalidArgumentException('Provided ShareType is invalid');
		}

and create issues in identified apps?

[nickvergessen]

Blocking merge until apps have been fixed

[nickvergessen]

So your proposal is:

Suggested change

	$shareType = $pluginInfo['shareType'];
	if (str_starts_with($pluginInfo['shareType'], 'SHARE_TYPE') {
	$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
	} else {
	$shareType = $pluginInfo['shareType'];
	}

[nickvergessen]

How about:

Suggested change

	$shareType = $pluginInfo['shareType'];
	if (str_starts_with($pluginInfo['shareType'], 'SHARE_TYPE') {
	$shareType = constant(IShare::class . '::' . substr($pluginInfo['shareType'], 6));
	} else {
	$shareType = $pluginInfo['shareType'];
	}

This way we still get rid of the old constats?

[nickvergessen]

Please also note that $shareType is a int after constant() but not with your code.
So should use the following on the else branch

		$shareType = (int) $pluginInfo['shareType'];

[juliusknorr]

@StCyr Any update on this? Any chance you could open issues for the apps that need fixing? For backward compatiblity we could also go the str_starts_with approach that was commented already.

[skjnldsv]

As there is no feedback since a while I will close this ticket.
If you will decide to work on this feature again and if it hasn't been fixed or implemented already, feel free to re-open and solve the various conflicts.

Thanks for the interest in Nextcloud and the effort put into this! 🙇