sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49518 from nextcloud/bugfix/noid/activity-logs 

fix(activity): Fix activity object type warnings
pull/49527/head
Joas Schilling 2024-11-27 13:16:46 +07:00 committed by GitHub
parent 5e785fb7b0 d1e17e78b7
commit 6230849e46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/settings/lib/Activity/Provider.php
Unescape Escape View File

@ -129,7 +129,7 @@ class Provider implements IProvider {
return [ return [
'token' => [ 'token' => [
'type' => 'highlight', 'type' => 'highlight',
'id' => $event->getObjectId(), 'id' => (string)$event->getObjectId(),
'name' => $parameters['name'], 'name' => $parameters['name'],
] ]
]; ];
@ -137,12 +137,12 @@ class Provider implements IProvider {
return [ return [
'token' => [ 'token' => [
'type' => 'highlight', 'type' => 'highlight',
'id' => $event->getObjectId(), 'id' => (string)$event->getObjectId(),
'name' => $parameters['name'], 'name' => $parameters['name'],
], ],
'newToken' => [ 'newToken' => [
'type' => 'highlight', 'type' => 'highlight',
'id' => $event->getObjectId(), 'id' => (string)$event->getObjectId(),
'name' => $parameters['newName'], 'name' => $parameters['newName'],
] ]
]; ];

2
lib/public/TaskProcessing/ISynchronousProvider.php
Unescape Escape View File

@ -28,7 +28,7 @@ interface ISynchronousProvider extends IProvider {
* @param callable(float):bool $reportProgress Report the task progress. If this returns false, that means the task was cancelled and processing should be stopped. * @param callable(float):bool $reportProgress Report the task progress. If this returns false, that means the task was cancelled and processing should be stopped.
* @psalm-return array<string, list<numeric|string>|numeric|string> * @psalm-return array<string, list<numeric|string>|numeric|string>
* @throws ProcessingException * @throws ProcessingException
*@since 30.0.0 * @since 30.0.0
*/ */
public function process(?string $userId, array $input, callable $reportProgress): array; public function process(?string $userId, array $input, callable $reportProgress): array;
} }