From a45978789b57bc58dc9a65cb3d0679c03ec88b4f Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Mon, 12 Jan 2026 13:34:07 +0100 Subject: [PATCH] fix(TaskProcessing): Expose userFacingErrorMessage on ResponseDefinitions#CoreTaskProcessingTask Signed-off-by: Marcel Klehr --- core/ResponseDefinitions.php | 1 + lib/public/TaskProcessing/Task.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/ResponseDefinitions.php b/core/ResponseDefinitions.php index 82421a58039..6f3380bab25 100644 --- a/core/ResponseDefinitions.php +++ b/core/ResponseDefinitions.php @@ -212,6 +212,7 @@ namespace OC\Core; * endedAt: ?int, * allowCleanup: bool, * includeWatermark: bool, + * userFacingErrorMessage: ?string, * } * * @psalm-type CoreProfileAction = array{ diff --git a/lib/public/TaskProcessing/Task.php b/lib/public/TaskProcessing/Task.php index a2899a1f1c9..f0096c42a70 100644 --- a/lib/public/TaskProcessing/Task.php +++ b/lib/public/TaskProcessing/Task.php @@ -295,7 +295,7 @@ final class Task implements \JsonSerializable { } /** - * @psalm-return array{id: int, lastUpdated: int, type: string, status: 'STATUS_CANCELLED'|'STATUS_FAILED'|'STATUS_SUCCESSFUL'|'STATUS_RUNNING'|'STATUS_SCHEDULED'|'STATUS_UNKNOWN', userId: ?string, appId: string, input: array|numeric|string>, output: ?array|numeric|string>, customId: ?string, completionExpectedAt: ?int, progress: ?float, scheduledAt: ?int, startedAt: ?int, endedAt: ?int, allowCleanup: bool, includeWatermark: bool} + * @psalm-return array{id: int, lastUpdated: int, type: string, status: 'STATUS_CANCELLED'|'STATUS_FAILED'|'STATUS_SUCCESSFUL'|'STATUS_RUNNING'|'STATUS_SCHEDULED'|'STATUS_UNKNOWN', userId: ?string, appId: string, input: array|numeric|string>, output: ?array|numeric|string>, customId: ?string, completionExpectedAt: ?int, progress: ?float, scheduledAt: ?int, startedAt: ?int, endedAt: ?int, allowCleanup: bool, includeWatermark: bool, userFacingErrorMessage: ?string} * @since 30.0.0 */ final public function jsonSerialize(): array { @@ -316,6 +316,7 @@ final class Task implements \JsonSerializable { 'endedAt' => $this->getEndedAt(), 'allowCleanup' => $this->getAllowCleanup(), 'includeWatermark' => $this->getIncludeWatermark(), + 'userFacingErrorMessage' => $this->getUserFacingErrorMessage(), ]; }