aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2024-11-27 13:16:46 +0100
committerGitHub <noreply@github.com>2024-11-27 13:16:46 +0100
commit6230849e4692a49bc40f7781e96cc81c04f409a3 (patch)
treed34a02b5327b13b8883aedf89048c7d0b51463a5
parent5e785fb7b068bc453cd2f7c0effb92137bd15b8a (diff)
parentd1e17e78b7f519cd66c57dd84b5cfff614a33fd7 (diff)
downloadnextcloud-server-6230849e4692a49bc40f7781e96cc81c04f409a3.tar.gz
nextcloud-server-6230849e4692a49bc40f7781e96cc81c04f409a3.zip
Merge pull request #49518 from nextcloud/bugfix/noid/activity-logs
fix(activity): Fix activity object type warnings
-rw-r--r--apps/settings/lib/Activity/Provider.php6
-rw-r--r--lib/public/TaskProcessing/ISynchronousProvider.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/settings/lib/Activity/Provider.php b/apps/settings/lib/Activity/Provider.php
index fb95423a4c1..c31a900abd5 100644
--- a/apps/settings/lib/Activity/Provider.php
+++ b/apps/settings/lib/Activity/Provider.php
@@ -129,7 +129,7 @@ class Provider implements IProvider {
return [
'token' => [
'type' => 'highlight',
- 'id' => $event->getObjectId(),
+ 'id' => (string)$event->getObjectId(),
'name' => $parameters['name'],
]
];
@@ -137,12 +137,12 @@ class Provider implements IProvider {
return [
'token' => [
'type' => 'highlight',
- 'id' => $event->getObjectId(),
+ 'id' => (string)$event->getObjectId(),
'name' => $parameters['name'],
],
'newToken' => [
'type' => 'highlight',
- 'id' => $event->getObjectId(),
+ 'id' => (string)$event->getObjectId(),
'name' => $parameters['newName'],
]
];
diff --git a/lib/public/TaskProcessing/ISynchronousProvider.php b/lib/public/TaskProcessing/ISynchronousProvider.php
index 8cd504af189..d7e42684df5 100644
--- a/lib/public/TaskProcessing/ISynchronousProvider.php
+++ b/lib/public/TaskProcessing/ISynchronousProvider.php
@@ -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.
* @psalm-return array<string, list<numeric|string>|numeric|string>
* @throws ProcessingException
- *@since 30.0.0
+ * @since 30.0.0
*/
public function process(?string $userId, array $input, callable $reportProgress): array;
}